diff --git a/shadow-dom/10-elements-and-dom-objects/03-csshostrule-interface/01-csshostrule-attributes/test-001.html b/shadow-dom/elements-and-dom-objects/csshostrule-interface/csshostrule-attributes/test-001.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/03-csshostrule-interface/01-csshostrule-attributes/test-001.html
rename to shadow-dom/elements-and-dom-objects/csshostrule-interface/csshostrule-attributes/test-001.html
diff --git a/shadow-dom/10-elements-and-dom-objects/03-csshostrule-interface/01-csshostrule-attributes/test-002.html b/shadow-dom/elements-and-dom-objects/csshostrule-interface/csshostrule-attributes/test-002.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/03-csshostrule-interface/01-csshostrule-attributes/test-002.html
rename to shadow-dom/elements-and-dom-objects/csshostrule-interface/csshostrule-attributes/test-002.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-001.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-001.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-001.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-001.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-002.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-002.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-002.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-002.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-003.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-003.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-003.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-003.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-004.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-004.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-004.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-004.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-005.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-005.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-005.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-005.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-006.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/01-attributes/test-006.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/attributes/test-006.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/02-methods/test-001.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/02-methods/test-001.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-001.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/02-methods/test-002.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/02-methods/test-002.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-002.html
diff --git a/shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/02-methods/test-003.html b/shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-003.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/02-extensions-to-element-interface/02-methods/test-003.html
rename to shadow-dom/elements-and-dom-objects/extensions-to-element-interface/methods/test-003.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-001.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-001.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-001.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-001.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-002.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-002.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-002.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-002.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-003.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-003.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-003.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-003.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-004.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-004.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-004.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-004.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-005.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-005.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-005.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-005.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-006.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-006.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-006.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-006.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-007.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-007.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-007.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-008.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-008.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-008.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-008.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-009.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-009.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-009.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-010.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-010.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-010.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-011.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-011.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-011.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-012.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-012.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-012.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-013.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/01-shadowroot-attributes/test-013.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-attributes/test-013.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-001.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-001.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-001.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-002.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-002.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-002.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-003.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-003.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-003.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-004.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-004.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-004.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-005.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-005.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-005.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-006.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-006.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-006.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-007.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-007.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-007.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-008.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-008.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-008.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-008.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-009.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-009.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-009.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-009.html
diff --git a/shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-010.html b/shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/01-shadowroot-object/02-shadowroot-methods/test-010.html
rename to shadow-dom/elements-and-dom-objects/shadowroot-object/shadowroot-methods/test-010.html
diff --git a/shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-001.html b/shadow-dom/elements-and-dom-objects/the-content-html-element/test-001.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-001.html
rename to shadow-dom/elements-and-dom-objects/the-content-html-element/test-001.html
diff --git a/shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-002.html b/shadow-dom/elements-and-dom-objects/the-content-html-element/test-002.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-002.html
rename to shadow-dom/elements-and-dom-objects/the-content-html-element/test-002.html
diff --git a/shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-003.html b/shadow-dom/elements-and-dom-objects/the-content-html-element/test-003.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-003.html
rename to shadow-dom/elements-and-dom-objects/the-content-html-element/test-003.html
diff --git a/shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-004.html b/shadow-dom/elements-and-dom-objects/the-content-html-element/test-004.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-004.html
rename to shadow-dom/elements-and-dom-objects/the-content-html-element/test-004.html
diff --git a/shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-005.html b/shadow-dom/elements-and-dom-objects/the-content-html-element/test-005.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-005.html
rename to shadow-dom/elements-and-dom-objects/the-content-html-element/test-005.html
diff --git a/shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-006.html b/shadow-dom/elements-and-dom-objects/the-content-html-element/test-006.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/04-the-content-html-element/test-006.html
rename to shadow-dom/elements-and-dom-objects/the-content-html-element/test-006.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-001.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-001.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-001.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-001.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-002.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-002.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-002.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-002.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-003.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-003.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-003.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-003.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-004.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-004.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-004.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-004.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-005.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-005.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-005.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-005.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-006.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-006.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-006.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-006.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-007.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-007.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-007.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-007.html
diff --git a/shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-008.html b/shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-008.html
similarity index 100%
rename from shadow-dom/10-elements-and-dom-objects/05-the-shadow-html-element/test-008.html
rename to shadow-dom/elements-and-dom-objects/the-shadow-html-element/test-008.html
diff --git a/shadow-dom/05-events/05-event-dispatch/test-001.html b/shadow-dom/events/event-dispatch/test-001.html
similarity index 100%
rename from shadow-dom/05-events/05-event-dispatch/test-001.html
rename to shadow-dom/events/event-dispatch/test-001.html
diff --git a/shadow-dom/05-events/05-event-dispatch/test-002.html b/shadow-dom/events/event-dispatch/test-002.html
similarity index 100%
rename from shadow-dom/05-events/05-event-dispatch/test-002.html
rename to shadow-dom/events/event-dispatch/test-002.html
diff --git a/shadow-dom/05-events/05-event-dispatch/test-003.html b/shadow-dom/events/event-dispatch/test-003.html
similarity index 100%
rename from shadow-dom/05-events/05-event-dispatch/test-003.html
rename to shadow-dom/events/event-dispatch/test-003.html
diff --git a/shadow-dom/05-events/01-event-retargeting/test-001.html b/shadow-dom/events/event-retargeting/test-001.html
similarity index 100%
rename from shadow-dom/05-events/01-event-retargeting/test-001.html
rename to shadow-dom/events/event-retargeting/test-001.html
diff --git a/shadow-dom/05-events/01-event-retargeting/test-002.html b/shadow-dom/events/event-retargeting/test-002.html
similarity index 100%
rename from shadow-dom/05-events/01-event-retargeting/test-002.html
rename to shadow-dom/events/event-retargeting/test-002.html
diff --git a/shadow-dom/05-events/01-event-retargeting/test-003.html b/shadow-dom/events/event-retargeting/test-003.html
similarity index 100%
rename from shadow-dom/05-events/01-event-retargeting/test-003.html
rename to shadow-dom/events/event-retargeting/test-003.html
diff --git a/shadow-dom/05-events/01-event-retargeting/test-004.html b/shadow-dom/events/event-retargeting/test-004.html
similarity index 100%
rename from shadow-dom/05-events/01-event-retargeting/test-004.html
rename to shadow-dom/events/event-retargeting/test-004.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-001.html b/shadow-dom/events/events-that-are-always-stopped/test-001.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-001.html
rename to shadow-dom/events/events-that-are-always-stopped/test-001.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-002.html b/shadow-dom/events/events-that-are-always-stopped/test-002.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-002.html
rename to shadow-dom/events/events-that-are-always-stopped/test-002.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-003.html b/shadow-dom/events/events-that-are-always-stopped/test-003.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-003.html
rename to shadow-dom/events/events-that-are-always-stopped/test-003.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-004.html b/shadow-dom/events/events-that-are-always-stopped/test-004.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-004.html
rename to shadow-dom/events/events-that-are-always-stopped/test-004.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-005.html b/shadow-dom/events/events-that-are-always-stopped/test-005.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-005.html
rename to shadow-dom/events/events-that-are-always-stopped/test-005.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-006.html b/shadow-dom/events/events-that-are-always-stopped/test-006.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-006.html
rename to shadow-dom/events/events-that-are-always-stopped/test-006.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-007.html b/shadow-dom/events/events-that-are-always-stopped/test-007.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-007.html
rename to shadow-dom/events/events-that-are-always-stopped/test-007.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-008.html b/shadow-dom/events/events-that-are-always-stopped/test-008.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-008.html
rename to shadow-dom/events/events-that-are-always-stopped/test-008.html
diff --git a/shadow-dom/05-events/04-events-that-are-always-stopped/test-009.html b/shadow-dom/events/events-that-are-always-stopped/test-009.html
similarity index 100%
rename from shadow-dom/05-events/04-events-that-are-always-stopped/test-009.html
rename to shadow-dom/events/events-that-are-always-stopped/test-009.html
diff --git a/shadow-dom/05-events/03-retargeting-focus-events/test-001.html b/shadow-dom/events/retargeting-focus-events/test-001.html
similarity index 100%
rename from shadow-dom/05-events/03-retargeting-focus-events/test-001.html
rename to shadow-dom/events/retargeting-focus-events/test-001.html
diff --git a/shadow-dom/05-events/03-retargeting-focus-events/test-002.html b/shadow-dom/events/retargeting-focus-events/test-002.html
similarity index 100%
rename from shadow-dom/05-events/03-retargeting-focus-events/test-002.html
rename to shadow-dom/events/retargeting-focus-events/test-002.html
diff --git a/shadow-dom/05-events/03-retargeting-focus-events/test-003.html b/shadow-dom/events/retargeting-focus-events/test-003.html
similarity index 100%
rename from shadow-dom/05-events/03-retargeting-focus-events/test-003.html
rename to shadow-dom/events/retargeting-focus-events/test-003.html
diff --git a/shadow-dom/05-events/02-retargeting-relatedtarget/test-001.html b/shadow-dom/events/retargeting-relatedtarget/test-001.html
similarity index 100%
rename from shadow-dom/05-events/02-retargeting-relatedtarget/test-001.html
rename to shadow-dom/events/retargeting-relatedtarget/test-001.html
diff --git a/shadow-dom/05-events/02-retargeting-relatedtarget/test-002.html b/shadow-dom/events/retargeting-relatedtarget/test-002.html
similarity index 100%
rename from shadow-dom/05-events/02-retargeting-relatedtarget/test-002.html
rename to shadow-dom/events/retargeting-relatedtarget/test-002.html
diff --git a/shadow-dom/05-events/02-retargeting-relatedtarget/test-003.html b/shadow-dom/events/retargeting-relatedtarget/test-003.html
similarity index 100%
rename from shadow-dom/05-events/02-retargeting-relatedtarget/test-003.html
rename to shadow-dom/events/retargeting-relatedtarget/test-003.html
diff --git a/shadow-dom/05-events/test-001.html b/shadow-dom/events/test-001.html
similarity index 100%
rename from shadow-dom/05-events/test-001.html
rename to shadow-dom/events/test-001.html
diff --git a/shadow-dom/09-html-elements-and-their-shadow-trees/test-001.html b/shadow-dom/html-elements-and-their-shadow-trees/test-001.html
similarity index 100%
rename from shadow-dom/09-html-elements-and-their-shadow-trees/test-001.html
rename to shadow-dom/html-elements-and-their-shadow-trees/test-001.html
diff --git a/shadow-dom/09-html-elements-and-their-shadow-trees/test-002.html b/shadow-dom/html-elements-and-their-shadow-trees/test-002.html
similarity index 100%
rename from shadow-dom/09-html-elements-and-their-shadow-trees/test-002.html
rename to shadow-dom/html-elements-and-their-shadow-trees/test-002.html
diff --git a/shadow-dom/09-html-elements-and-their-shadow-trees/test-003.html b/shadow-dom/html-elements-and-their-shadow-trees/test-003.html
similarity index 100%
rename from shadow-dom/09-html-elements-and-their-shadow-trees/test-003.html
rename to shadow-dom/html-elements-and-their-shadow-trees/test-003.html
diff --git a/shadow-dom/09-html-elements-and-their-shadow-trees/test-004.html b/shadow-dom/html-elements-and-their-shadow-trees/test-004.html
similarity index 100%
rename from shadow-dom/09-html-elements-and-their-shadow-trees/test-004.html
rename to shadow-dom/html-elements-and-their-shadow-trees/test-004.html
diff --git a/shadow-dom/08-html-elements-in-shadow-trees/02-html-forms/test-001.html b/shadow-dom/html-elements-in-shadow-trees/html-forms/test-001.html
similarity index 100%
rename from shadow-dom/08-html-elements-in-shadow-trees/02-html-forms/test-001.html
rename to shadow-dom/html-elements-in-shadow-trees/html-forms/test-001.html
diff --git a/shadow-dom/08-html-elements-in-shadow-trees/02-html-forms/test-002.html b/shadow-dom/html-elements-in-shadow-trees/html-forms/test-002.html
similarity index 100%
rename from shadow-dom/08-html-elements-in-shadow-trees/02-html-forms/test-002.html
rename to shadow-dom/html-elements-in-shadow-trees/html-forms/test-002.html
diff --git a/shadow-dom/08-html-elements-in-shadow-trees/02-html-forms/test-003.html b/shadow-dom/html-elements-in-shadow-trees/html-forms/test-003.html
similarity index 100%
rename from shadow-dom/08-html-elements-in-shadow-trees/02-html-forms/test-003.html
rename to shadow-dom/html-elements-in-shadow-trees/html-forms/test-003.html
diff --git a/shadow-dom/08-html-elements-in-shadow-trees/01-inert-html-elements/test-001.html b/shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-001.html
similarity index 100%
rename from shadow-dom/08-html-elements-in-shadow-trees/01-inert-html-elements/test-001.html
rename to shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-001.html
diff --git a/shadow-dom/08-html-elements-in-shadow-trees/01-inert-html-elements/test-002.html b/shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-002.html
similarity index 100%
rename from shadow-dom/08-html-elements-in-shadow-trees/01-inert-html-elements/test-002.html
rename to shadow-dom/html-elements-in-shadow-trees/inert-html-elements/test-002.html
diff --git a/shadow-dom/04-shadow-trees/07-composition/test-001.html b/shadow-dom/shadow-trees/composition/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/07-composition/test-001.html
rename to shadow-dom/shadow-trees/composition/test-001.html
diff --git a/shadow-dom/04-shadow-trees/10-custom-pseudo-elements/test-001.html b/shadow-dom/shadow-trees/custom-pseudo-elements/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/10-custom-pseudo-elements/test-001.html
rename to shadow-dom/shadow-trees/custom-pseudo-elements/test-001.html
diff --git a/shadow-dom/04-shadow-trees/04-distributed-pseudo-element/test-001.html b/shadow-dom/shadow-trees/distributed-pseudo-element/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/04-distributed-pseudo-element/test-001.html
rename to shadow-dom/shadow-trees/distributed-pseudo-element/test-001.html
diff --git a/shadow-dom/04-shadow-trees/05-hosting-multiple-shadow-trees/test-001.html b/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/05-hosting-multiple-shadow-trees/test-001.html
rename to shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-001.html
diff --git a/shadow-dom/04-shadow-trees/05-hosting-multiple-shadow-trees/test-002.html b/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/05-hosting-multiple-shadow-trees/test-002.html
rename to shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-002.html
diff --git a/shadow-dom/04-shadow-trees/05-hosting-multiple-shadow-trees/test-003.html b/shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/05-hosting-multiple-shadow-trees/test-003.html
rename to shadow-dom/shadow-trees/hosting-multiple-shadow-trees/test-003.html
diff --git a/shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-001.html b/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-001.html
rename to shadow-dom/shadow-trees/lower-boundary-encapsulation/test-001.html
diff --git a/shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-002.html b/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-002.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-002.html
rename to shadow-dom/shadow-trees/lower-boundary-encapsulation/test-002.html
diff --git a/shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-003.html b/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-003.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-003.html
rename to shadow-dom/shadow-trees/lower-boundary-encapsulation/test-003.html
diff --git a/shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-004.html b/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-004.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-004.html
rename to shadow-dom/shadow-trees/lower-boundary-encapsulation/test-004.html
diff --git a/shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-005.html b/shadow-dom/shadow-trees/lower-boundary-encapsulation/test-005.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/02-lower-boundary-encapsulation/test-005.html
rename to shadow-dom/shadow-trees/lower-boundary-encapsulation/test-005.html
diff --git a/shadow-dom/04-shadow-trees/08-nested-shadow-trees/test-001.html b/shadow-dom/shadow-trees/nested-shadow-trees/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/08-nested-shadow-trees/test-001.html
rename to shadow-dom/shadow-trees/nested-shadow-trees/test-001.html
diff --git a/shadow-dom/04-shadow-trees/09-rendering-shadow-trees/test-001.html b/shadow-dom/shadow-trees/rendering-shadow-trees/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/09-rendering-shadow-trees/test-001.html
rename to shadow-dom/shadow-trees/rendering-shadow-trees/test-001.html
diff --git a/shadow-dom/04-shadow-trees/06-reprojection/test-001.html b/shadow-dom/shadow-trees/reprojection/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/06-reprojection/test-001.html
rename to shadow-dom/shadow-trees/reprojection/test-001.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-001.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-001.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-001.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-002.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-002.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-002.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-002.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-003.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-003.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-003.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-003.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-004.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-004.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-004.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-004.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-005.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-005.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-005.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-005.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-006.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-006.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-006.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-007.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-007.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-007.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-008.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-008.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-008.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-009.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-009.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-009.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-010.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-010.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-010.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-011.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-011.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-011.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-012.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-012.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-012.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-013.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-013.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-013.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-014.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-014.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-014.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-015.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-015.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-015.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-016.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-016.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-016.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-017.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-017.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-017.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-018.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-018.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-018.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-019.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-019.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-019.html
diff --git a/shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-020.html b/shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/03-satisfying-matching-criteria/test-020.html
rename to shadow-dom/shadow-trees/satisfying-matching-criteria/test-020.html
diff --git a/shadow-dom/04-shadow-trees/test-001.html b/shadow-dom/shadow-trees/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/test-001.html
rename to shadow-dom/shadow-trees/test-001.html
diff --git a/shadow-dom/04-shadow-trees/test-002.html b/shadow-dom/shadow-trees/test-002.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/test-002.html
rename to shadow-dom/shadow-trees/test-002.html
diff --git a/shadow-dom/04-shadow-trees/test-003.html b/shadow-dom/shadow-trees/test-003.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/test-003.html
rename to shadow-dom/shadow-trees/test-003.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-001.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-001.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-001.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-001.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-002.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-002.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-002.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-002.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-003.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-003.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-003.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-003.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-004.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-004.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-004.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-004.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-005.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-005.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-005.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-005.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-006.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-006.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-006.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-006.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-007.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-007.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-007.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-007.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-008.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-008.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-008.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-008.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-009.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-009.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-009.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-009.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-010.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-010.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-010.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-010.html
diff --git a/shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-011.html b/shadow-dom/shadow-trees/upper-boundary-encapsulation/test-011.html
similarity index 100%
rename from shadow-dom/04-shadow-trees/01-upper-boundary-encapsulation/test-011.html
rename to shadow-dom/shadow-trees/upper-boundary-encapsulation/test-011.html
diff --git a/shadow-dom/06-styles/03-at-host-at-rule/test-001.html b/shadow-dom/styles/at-host-at-rule/test-001.html
similarity index 100%
rename from shadow-dom/06-styles/03-at-host-at-rule/test-001.html
rename to shadow-dom/styles/at-host-at-rule/test-001.html
diff --git a/shadow-dom/06-styles/01-css-variables/test-001.html b/shadow-dom/styles/css-variables/test-001.html
similarity index 100%
rename from shadow-dom/06-styles/01-css-variables/test-001.html
rename to shadow-dom/styles/css-variables/test-001.html
diff --git a/shadow-dom/06-styles/test-001.html b/shadow-dom/styles/test-001.html
similarity index 100%
rename from shadow-dom/06-styles/test-001.html
rename to shadow-dom/styles/test-001.html
diff --git a/shadow-dom/06-styles/test-002.html b/shadow-dom/styles/test-002.html
similarity index 100%
rename from shadow-dom/06-styles/test-002.html
rename to shadow-dom/styles/test-002.html
diff --git a/shadow-dom/06-styles/test-003.html b/shadow-dom/styles/test-003.html
similarity index 100%
rename from shadow-dom/06-styles/test-003.html
rename to shadow-dom/styles/test-003.html
diff --git a/shadow-dom/06-styles/test-004.html b/shadow-dom/styles/test-004.html
similarity index 100%
rename from shadow-dom/06-styles/test-004.html
rename to shadow-dom/styles/test-004.html
diff --git a/shadow-dom/06-styles/test-005.html b/shadow-dom/styles/test-005.html
similarity index 100%
rename from shadow-dom/06-styles/test-005.html
rename to shadow-dom/styles/test-005.html
diff --git a/shadow-dom/06-styles/test-006.html b/shadow-dom/styles/test-006.html
similarity index 100%
rename from shadow-dom/06-styles/test-006.html
rename to shadow-dom/styles/test-006.html
diff --git a/shadow-dom/06-styles/test-007.html b/shadow-dom/styles/test-007.html
similarity index 100%
rename from shadow-dom/06-styles/test-007.html
rename to shadow-dom/styles/test-007.html
diff --git a/shadow-dom/06-styles/test-008.html b/shadow-dom/styles/test-008.html
similarity index 100%
rename from shadow-dom/06-styles/test-008.html
rename to shadow-dom/styles/test-008.html
diff --git a/shadow-dom/06-styles/test-009.html b/shadow-dom/styles/test-009.html
similarity index 100%
rename from shadow-dom/06-styles/test-009.html
rename to shadow-dom/styles/test-009.html
diff --git a/shadow-dom/06-styles/test-010.html b/shadow-dom/styles/test-010.html
similarity index 100%
rename from shadow-dom/06-styles/test-010.html
rename to shadow-dom/styles/test-010.html
diff --git a/shadow-dom/06-styles/test-011.html b/shadow-dom/styles/test-011.html
similarity index 100%
rename from shadow-dom/06-styles/test-011.html
rename to shadow-dom/styles/test-011.html
diff --git a/shadow-dom/06-styles/test-012.html b/shadow-dom/styles/test-012.html
similarity index 100%
rename from shadow-dom/06-styles/test-012.html
rename to shadow-dom/styles/test-012.html
diff --git a/shadow-dom/07-user-interaction/03-active-element/test-001.html b/shadow-dom/user-interaction/active-element/test-001.html
similarity index 100%
rename from shadow-dom/07-user-interaction/03-active-element/test-001.html
rename to shadow-dom/user-interaction/active-element/test-001.html
diff --git a/shadow-dom/07-user-interaction/03-active-element/test-002.html b/shadow-dom/user-interaction/active-element/test-002.html
similarity index 100%
rename from shadow-dom/07-user-interaction/03-active-element/test-002.html
rename to shadow-dom/user-interaction/active-element/test-002.html
diff --git a/shadow-dom/07-user-interaction/02-focus-navigation/test-001.html b/shadow-dom/user-interaction/focus-navigation/test-001.html
similarity index 100%
rename from shadow-dom/07-user-interaction/02-focus-navigation/test-001.html
rename to shadow-dom/user-interaction/focus-navigation/test-001.html
diff --git a/shadow-dom/07-user-interaction/02-focus-navigation/test-002.html b/shadow-dom/user-interaction/focus-navigation/test-002.html
similarity index 100%
rename from shadow-dom/07-user-interaction/02-focus-navigation/test-002.html
rename to shadow-dom/user-interaction/focus-navigation/test-002.html
diff --git a/shadow-dom/07-user-interaction/02-focus-navigation/test-003.html b/shadow-dom/user-interaction/focus-navigation/test-003.html
similarity index 100%
rename from shadow-dom/07-user-interaction/02-focus-navigation/test-003.html
rename to shadow-dom/user-interaction/focus-navigation/test-003.html
diff --git a/shadow-dom/07-user-interaction/02-focus-navigation/test-004.html b/shadow-dom/user-interaction/focus-navigation/test-004.html
similarity index 100%
rename from shadow-dom/07-user-interaction/02-focus-navigation/test-004.html
rename to shadow-dom/user-interaction/focus-navigation/test-004.html
diff --git a/shadow-dom/07-user-interaction/01-ranges-and-selections/test-001.html b/shadow-dom/user-interaction/ranges-and-selections/test-001.html
similarity index 100%
rename from shadow-dom/07-user-interaction/01-ranges-and-selections/test-001.html
rename to shadow-dom/user-interaction/ranges-and-selections/test-001.html
diff --git a/shadow-dom/07-user-interaction/01-ranges-and-selections/test-002.html b/shadow-dom/user-interaction/ranges-and-selections/test-002.html
similarity index 100%
rename from shadow-dom/07-user-interaction/01-ranges-and-selections/test-002.html
rename to shadow-dom/user-interaction/ranges-and-selections/test-002.html