--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -35934,22 +35934,52 @@
       {
         "path": "webdriver/navigation.py",
         "url": "/webdriver/navigation.py"
       }
     ]
   },
   "local_changes": {
     "deleted": [
-      "web-animations/keyframe-effect/getComputedTiming-currentIteration.html",
-      "web-animations/keyframe-effect/getComputedTiming-progress.html",
+      "web-animations/animatable/animate.html",
+      "web-animations/keyframe-effect/getComputedTiming.html",
+      "web-animations/animation/cancel.html",
+      "web-animations/animation/reverse.html",
+      "web-animations/animation-model/animation-types/not-animatable.html",
+      "web-animations/animation/playbackRate.html",
+      "web-animations/keyframe-effect/keyframe-handling.html",
+      "web-animations/animation/finish.html",
+      "web-animations/animation/startTime.html",
+      "web-animations/animation-timeline/document-timeline.html",
+      "web-animations/animation-model/keyframes/effect-value-context.html",
+      "web-animations/animation-effect-timing/delay.html",
+      "web-animations/animation-effect-timing/fill.html",
+      "web-animations/animation-effect-timing/getComputedStyle.html",
+      "web-animations/animation-effect-timing/endDelay.html",
+      "web-animations/animation/finished.html",
+      "web-animations/animation-effect-timing/iterationStart.html",
+      "web-animations/animation/id.html",
+      "web-animations/keyframe-effect/setTarget.html",
+      "web-animations/animation/oncancel.html",
+      "web-animations/animation-effect-timing/direction.html",
+      "web-animations/animation-effect-timing/easing.html",
+      "web-animations/animation-effect-timing/getAnimations.html",
+      "web-animations/animation/play.html",
       "web-animations/keyframe-effect/setFrames.html",
-      "web-animations/animation-model/keyframes/effect-value-context.html",
-      "web-animations/animation-model/animation-types/not-animatable.html",
-      "web-animations/keyframe-effect/keyframe-handling.html"
+      "web-animations/animation-effect-timing/duration.html",
+      "web-animations/animation/ready.html",
+      "web-animations/animation/pause.html",
+      "web-animations/animation/onfinish.html",
+      "web-animations/keyframe-effect/effect-easing.html",
+      "web-animations/animation-effect-timing/iterations.html",
+      "web-animations/animation-timeline/idlharness.html",
+      "web-animations/animation/playState.html",
+      "web-animations/document/getAnimations.html",
+      "web-animations/animation/constructor.html",
+      "web-animations/keyframe-effect/constructor.html"
     ],
     "deleted_reftests": {},
     "items": {
       "testharness": {
         "html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html": [
           {
             "path": "html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html",
             "url": "/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling.html"
@@ -35962,111 +35992,231 @@
           }
         ],
         "html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html": [
           {
             "path": "html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html",
             "url": "/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping.html"
           }
         ],
-        "html/syntax/serializing-html-fragments/serializing.html": [
+        "web-animations/Animatable/animate.html": [
+          {
+            "path": "web-animations/Animatable/animate.html",
+            "url": "/web-animations/Animatable/animate.html"
+          }
+        ],
+        "web-animations/Animation/cancel.html": [
+          {
+            "path": "web-animations/Animation/cancel.html",
+            "url": "/web-animations/Animation/cancel.html"
+          }
+        ],
+        "web-animations/Animation/constructor.html": [
+          {
+            "path": "web-animations/Animation/constructor.html",
+            "url": "/web-animations/Animation/constructor.html"
+          }
+        ],
+        "web-animations/Animation/finish.html": [
           {
-            "path": "html/syntax/serializing-html-fragments/serializing.html",
-            "url": "/html/syntax/serializing-html-fragments/serializing.html"
+            "path": "web-animations/Animation/finish.html",
+            "url": "/web-animations/Animation/finish.html"
+          }
+        ],
+        "web-animations/Animation/finished.html": [
+          {
+            "path": "web-animations/Animation/finished.html",
+            "url": "/web-animations/Animation/finished.html"
+          }
+        ],
+        "web-animations/Animation/id.html": [
+          {
+            "path": "web-animations/Animation/id.html",
+            "url": "/web-animations/Animation/id.html"
+          }
+        ],
+        "web-animations/Animation/oncancel.html": [
+          {
+            "path": "web-animations/Animation/oncancel.html",
+            "url": "/web-animations/Animation/oncancel.html"
+          }
+        ],
+        "web-animations/Animation/onfinish.html": [
+          {
+            "path": "web-animations/Animation/onfinish.html",
+            "url": "/web-animations/Animation/onfinish.html"
           }
         ],
-        "secure-contexts/basic-popup-and-iframe-tests.html": [
+        "web-animations/Animation/pause.html": [
+          {
+            "path": "web-animations/Animation/pause.html",
+            "url": "/web-animations/Animation/pause.html"
+          }
+        ],
+        "web-animations/Animation/play.html": [
+          {
+            "path": "web-animations/Animation/play.html",
+            "url": "/web-animations/Animation/play.html"
+          }
+        ],
+        "web-animations/Animation/playState.html": [
+          {
+            "path": "web-animations/Animation/playState.html",
+            "url": "/web-animations/Animation/playState.html"
+          }
+        ],
+        "web-animations/Animation/playbackRate.html": [
           {
-            "path": "secure-contexts/basic-popup-and-iframe-tests.html",
-            "url": "/secure-contexts/basic-popup-and-iframe-tests.html"
+            "path": "web-animations/Animation/playbackRate.html",
+            "url": "/web-animations/Animation/playbackRate.html"
+          }
+        ],
+        "web-animations/Animation/ready.html": [
+          {
+            "path": "web-animations/Animation/ready.html",
+            "url": "/web-animations/Animation/ready.html"
+          }
+        ],
+        "web-animations/Animation/reverse.html": [
+          {
+            "path": "web-animations/Animation/reverse.html",
+            "url": "/web-animations/Animation/reverse.html"
           }
         ],
-        "secure-contexts/basic-popup-and-iframe-tests.https.html": [
+        "web-animations/Animation/startTime.html": [
+          {
+            "path": "web-animations/Animation/startTime.html",
+            "url": "/web-animations/Animation/startTime.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/delay.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/delay.html",
+            "url": "/web-animations/AnimationEffectTiming/delay.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/direction.html": [
           {
-            "path": "secure-contexts/basic-popup-and-iframe-tests.https.html",
-            "url": "/secure-contexts/basic-popup-and-iframe-tests.https.html"
+            "path": "web-animations/AnimationEffectTiming/direction.html",
+            "url": "/web-animations/AnimationEffectTiming/direction.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/duration.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/duration.html",
+            "url": "/web-animations/AnimationEffectTiming/duration.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/easing.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/easing.html",
+            "url": "/web-animations/AnimationEffectTiming/easing.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/endDelay.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/endDelay.html",
+            "url": "/web-animations/AnimationEffectTiming/endDelay.html"
           }
         ],
-        "service-workers/service-worker/navigate-window.https.html": [
+        "web-animations/AnimationEffectTiming/fill.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/fill.html",
+            "url": "/web-animations/AnimationEffectTiming/fill.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/getAnimations.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/getAnimations.html",
+            "url": "/web-animations/AnimationEffectTiming/getAnimations.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/getComputedStyle.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/getComputedStyle.html",
+            "url": "/web-animations/AnimationEffectTiming/getComputedStyle.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/iterationStart.html": [
+          {
+            "path": "web-animations/AnimationEffectTiming/iterationStart.html",
+            "url": "/web-animations/AnimationEffectTiming/iterationStart.html"
+          }
+        ],
+        "web-animations/AnimationEffectTiming/iterations.html": [
           {
-            "path": "service-workers/service-worker/navigate-window.https.html",
-            "url": "/service-workers/service-worker/navigate-window.https.html"
+            "path": "web-animations/AnimationEffectTiming/iterations.html",
+            "url": "/web-animations/AnimationEffectTiming/iterations.html"
+          }
+        ],
+        "web-animations/AnimationTimeline/document-timeline.html": [
+          {
+            "path": "web-animations/AnimationTimeline/document-timeline.html",
+            "url": "/web-animations/AnimationTimeline/document-timeline.html"
+          }
+        ],
+        "web-animations/AnimationTimeline/idlharness.html": [
+          {
+            "path": "web-animations/AnimationTimeline/idlharness.html",
+            "url": "/web-animations/AnimationTimeline/idlharness.html"
+          }
+        ],
+        "web-animations/Document/getAnimations.html": [
+          {
+            "path": "web-animations/Document/getAnimations.html",
+            "url": "/web-animations/Document/getAnimations.html"
+          }
+        ],
+        "web-animations/KeyframeEffect/constructor.html": [
+          {
+            "path": "web-animations/KeyframeEffect/constructor.html",
+            "url": "/web-animations/KeyframeEffect/constructor.html"
           }
         ],
-        "service-workers/service-worker/update-recovery.https.html": [
+        "web-animations/KeyframeEffect/effect-easing.html": [
+          {
+            "path": "web-animations/KeyframeEffect/effect-easing.html",
+            "url": "/web-animations/KeyframeEffect/effect-easing.html"
+          }
+        ],
+        "web-animations/KeyframeEffect/getComputedTiming.html": [
+          {
+            "path": "web-animations/KeyframeEffect/getComputedTiming.html",
+            "url": "/web-animations/KeyframeEffect/getComputedTiming.html"
+          }
+        ],
+        "web-animations/KeyframeEffect/processing-a-keyframes-argument.html": [
           {
-            "path": "service-workers/service-worker/update-recovery.https.html",
-            "url": "/service-workers/service-worker/update-recovery.https.html"
+            "path": "web-animations/KeyframeEffect/processing-a-keyframes-argument.html",
+            "url": "/web-animations/KeyframeEffect/processing-a-keyframes-argument.html"
+          }
+        ],
+        "web-animations/KeyframeEffect/setKeyframes.html": [
+          {
+            "path": "web-animations/KeyframeEffect/setKeyframes.html",
+            "url": "/web-animations/KeyframeEffect/setKeyframes.html"
+          }
+        ],
+        "web-animations/KeyframeEffect/setTarget.html": [
+          {
+            "path": "web-animations/KeyframeEffect/setTarget.html",
+            "url": "/web-animations/KeyframeEffect/setTarget.html"
           }
         ],
         "web-animations/animation-model/keyframe-effects/effect-value-context.html": [
           {
             "path": "web-animations/animation-model/keyframe-effects/effect-value-context.html",
             "url": "/web-animations/animation-model/keyframe-effects/effect-value-context.html"
           }
         ],
         "web-animations/animation-model/keyframe-effects/the-effect-value-of-a-keyframe-effect.html": [
           {
             "path": "web-animations/animation-model/keyframe-effects/the-effect-value-of-a-keyframe-effect.html",
             "url": "/web-animations/animation-model/keyframe-effects/the-effect-value-of-a-keyframe-effect.html"
           }
-        ],
-        "web-animations/animation/startTime.html": [
-          {
-            "path": "web-animations/animation/startTime.html",
-            "url": "/web-animations/animation/startTime.html"
-          }
-        ],
-        "web-animations/document/getAnimations.html": [
-          {
-            "path": "web-animations/document/getAnimations.html",
-            "url": "/web-animations/document/getAnimations.html"
-          }
-        ],
-        "web-animations/keyframe-effect/processing-a-keyframes-argument.html": [
-          {
-            "path": "web-animations/keyframe-effect/processing-a-keyframes-argument.html",
-            "url": "/web-animations/keyframe-effect/processing-a-keyframes-argument.html"
-          }
-        ],
-        "web-animations/keyframe-effect/setKeyframes.html": [
-          {
-            "path": "web-animations/keyframe-effect/setKeyframes.html",
-            "url": "/web-animations/keyframe-effect/setKeyframes.html"
-          }
-        ],
-        "web-animations/keyframe-effect/setTarget.html": [
-          {
-            "path": "web-animations/keyframe-effect/setTarget.html",
-            "url": "/web-animations/keyframe-effect/setTarget.html"
-          }
-        ],
-        "web-animations/timing-model/animation-effects/active-time.html": [
-          {
-            "path": "web-animations/timing-model/animation-effects/active-time.html",
-            "url": "/web-animations/timing-model/animation-effects/active-time.html"
-          }
-        ],
-        "web-animations/timing-model/animation-effects/current-iteration.html": [
-          {
-            "path": "web-animations/timing-model/animation-effects/current-iteration.html",
-            "url": "/web-animations/timing-model/animation-effects/current-iteration.html"
-          }
-        ],
-        "web-animations/timing-model/animation-effects/simple-iteration-progress.html": [
-          {
-            "path": "web-animations/timing-model/animation-effects/simple-iteration-progress.html",
-            "url": "/web-animations/timing-model/animation-effects/simple-iteration-progress.html"
-          }
-        ],
-        "web-animations/timing-model/animations/set-the-animation-start-time.html": [
-          {
-            "path": "web-animations/timing-model/animations/set-the-animation-start-time.html",
-            "url": "/web-animations/timing-model/animations/set-the-animation-start-time.html"
-          }
         ]
       }
     },
     "reftest_nodes": {}
   },
   "reftest_nodes": {
     "2dcontext/building-paths/canvas_complexshapes_arcto_001.htm": [
       {

rename from testing/web-platform/meta/web-animations/animatable/animate.html.ini
rename to testing/web-platform/meta/web-animations/Animatable/animate.html.ini

rename from testing/web-platform/meta/web-animations/animation/constructor.html.ini
rename to testing/web-platform/meta/web-animations/Animation/constructor.html.ini

rename from testing/web-platform/meta/web-animations/animation-timeline/idlharness.html.ini
rename to testing/web-platform/meta/web-animations/AnimationTimeline/idlharness.html.ini

rename from testing/web-platform/meta/web-animations/keyframe-effect/constructor.html.ini
rename to testing/web-platform/meta/web-animations/KeyframeEffect/constructor.html.ini

rename from testing/web-platform/meta/web-animations/keyframe-effect/setKeyframes.html.ini
rename to testing/web-platform/meta/web-animations/KeyframeEffect/setKeyframes.html.ini

rename from testing/web-platform/tests/web-animations/animatable/animate.html
rename to testing/web-platform/tests/web-animations/Animatable/animate.html

rename from testing/web-platform/tests/web-animations/animation/cancel.html
rename to testing/web-platform/tests/web-animations/Animation/cancel.html

rename from testing/web-platform/tests/web-animations/animation/constructor.html
rename to testing/web-platform/tests/web-animations/Animation/constructor.html

rename from testing/web-platform/tests/web-animations/animation/finish.html
rename to testing/web-platform/tests/web-animations/Animation/finish.html

rename from testing/web-platform/tests/web-animations/animation/finished.html
rename to testing/web-platform/tests/web-animations/Animation/finished.html

rename from testing/web-platform/tests/web-animations/animation/id.html
rename to testing/web-platform/tests/web-animations/Animation/id.html

rename from testing/web-platform/tests/web-animations/animation/oncancel.html
rename to testing/web-platform/tests/web-animations/Animation/oncancel.html

rename from testing/web-platform/tests/web-animations/animation/onfinish.html
rename to testing/web-platform/tests/web-animations/Animation/onfinish.html

rename from testing/web-platform/tests/web-animations/animation/pause.html
rename to testing/web-platform/tests/web-animations/Animation/pause.html

rename from testing/web-platform/tests/web-animations/animation/play.html
rename to testing/web-platform/tests/web-animations/Animation/play.html

rename from testing/web-platform/tests/web-animations/animation/playState.html
rename to testing/web-platform/tests/web-animations/Animation/playState.html

rename from testing/web-platform/tests/web-animations/animation/playbackRate.html
rename to testing/web-platform/tests/web-animations/Animation/playbackRate.html

rename from testing/web-platform/tests/web-animations/animation/ready.html
rename to testing/web-platform/tests/web-animations/Animation/ready.html

rename from testing/web-platform/tests/web-animations/animation/reverse.html
rename to testing/web-platform/tests/web-animations/Animation/reverse.html

rename from testing/web-platform/tests/web-animations/animation/startTime.html
rename to testing/web-platform/tests/web-animations/Animation/startTime.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/delay.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/delay.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/direction.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/direction.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/duration.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/duration.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/easing.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/easing.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/endDelay.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/endDelay.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/fill.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/fill.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/getAnimations.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/getAnimations.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/getComputedStyle.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/getComputedStyle.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/iterationStart.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/iterationStart.html

rename from testing/web-platform/tests/web-animations/animation-effect-timing/iterations.html
rename to testing/web-platform/tests/web-animations/AnimationEffectTiming/iterations.html

rename from testing/web-platform/tests/web-animations/animation-timeline/document-timeline.html
rename to testing/web-platform/tests/web-animations/AnimationTimeline/document-timeline.html

rename from testing/web-platform/tests/web-animations/animation-timeline/idlharness.html
rename to testing/web-platform/tests/web-animations/AnimationTimeline/idlharness.html

rename from testing/web-platform/tests/web-animations/document/getAnimations.html
rename to testing/web-platform/tests/web-animations/Document/getAnimations.html

rename from testing/web-platform/tests/web-animations/keyframe-effect/constructor.html
rename to testing/web-platform/tests/web-animations/KeyframeEffect/constructor.html

rename from testing/web-platform/tests/web-animations/keyframe-effect/effect-easing.html
rename to testing/web-platform/tests/web-animations/KeyframeEffect/effect-easing.html

rename from testing/web-platform/tests/web-animations/keyframe-effect/getComputedTiming.html
rename to testing/web-platform/tests/web-animations/KeyframeEffect/getComputedTiming.html

rename from testing/web-platform/tests/web-animations/keyframe-effect/processing-a-keyframes-argument.html
rename to testing/web-platform/tests/web-animations/KeyframeEffect/processing-a-keyframes-argument.html

rename from testing/web-platform/tests/web-animations/keyframe-effect/setKeyframes.html
rename to testing/web-platform/tests/web-animations/KeyframeEffect/setKeyframes.html

rename from testing/web-platform/tests/web-animations/keyframe-effect/setTarget.html
rename to testing/web-platform/tests/web-animations/KeyframeEffect/setTarget.html