diff --git a/DOMEvents/tests/submissions/Microsoft/CompositionEvent.html b/DOMEvents/CompositionEvent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/CompositionEvent.html
rename to DOMEvents/CompositionEvent.html
diff --git a/DOMEvents/tests/approved/DOM.event.flow.html b/DOMEvents/DOM.event.flow.html
similarity index 100%
rename from DOMEvents/tests/approved/DOM.event.flow.html
rename to DOMEvents/DOM.event.flow.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrChange.html b/DOMEvents/DOMAttrModified.attrChange.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrChange.html
rename to DOMEvents/DOMAttrModified.attrChange.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrName.html b/DOMEvents/DOMAttrModified.attrName.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMAttrModified.attrName.html
rename to DOMEvents/DOMAttrModified.attrName.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.html b/DOMEvents/DOMAttrModified.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMAttrModified.html
rename to DOMEvents/DOMAttrModified.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.newValue.html b/DOMEvents/DOMAttrModified.newValue.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMAttrModified.newValue.html
rename to DOMEvents/DOMAttrModified.newValue.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.prevValue.html b/DOMEvents/DOMAttrModified.prevValue.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMAttrModified.prevValue.html
rename to DOMEvents/DOMAttrModified.prevValue.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMAttrModified.relatedNode.html b/DOMEvents/DOMAttrModified.relatedNode.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMAttrModified.relatedNode.html
rename to DOMEvents/DOMAttrModified.relatedNode.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMCharacterDataModified.html b/DOMEvents/DOMCharacterDataModified.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMCharacterDataModified.html
rename to DOMEvents/DOMCharacterDataModified.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMEvents_harness.htm b/DOMEvents/DOMEvents_harness.htm
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMEvents_harness.htm
rename to DOMEvents/DOMEvents_harness.htm
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html b/DOMEvents/DOMNodeInserted_new.html
similarity index 96%
rename from DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html
rename to DOMEvents/DOMNodeInserted_new.html
index 59b4f24388450c..934a7eaaf7cb14 100644
--- a/DOMEvents/tests/submissions/Microsoft/converted/domnodeinserted.html
+++ b/DOMEvents/DOMNodeInserted_new.html
@@ -1,26 +1,26 @@
-
-
MutationEvent: DOMNodeInserted Event Type
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMNodeInserted.html b/DOMEvents/DOMNodeInserted_old.html
similarity index 96%
rename from DOMEvents/tests/submissions/Microsoft/DOMNodeInserted.html
rename to DOMEvents/DOMNodeInserted_old.html
index 9223febdcd94f4..d0118d5e013566 100644
--- a/DOMEvents/tests/submissions/Microsoft/DOMNodeInserted.html
+++ b/DOMEvents/DOMNodeInserted_old.html
@@ -1,64 +1,64 @@
-
-
-
- MutationEvent: DOMNodeInserted Event Type
-
-
-
-
DOM Events
-
- Test Description: DOMNodeInserted event fires when a node has been added as a child of another node.
-
+ Test Description: DOMNodeInserted event fires when a node has been added as a child of another node.
+
+
+
+
+
+
+
+
Test passes if the word "PASS" appears below.
+
Test result:
+
FAIL
+
\ No newline at end of file
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMNodeRemoved.html b/DOMEvents/DOMNodeRemoved.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMNodeRemoved.html
rename to DOMEvents/DOMNodeRemoved.html
diff --git a/DOMEvents/tests/submissions/Microsoft/DOMSubtreeModified.html b/DOMEvents/DOMSubtreeModified.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/DOMSubtreeModified.html
rename to DOMEvents/DOMSubtreeModified.html
diff --git a/DOMEvents/tests/approved/Determined.candidate.EventListeners.html b/DOMEvents/Determined.candidate.EventListeners.html
similarity index 100%
rename from DOMEvents/tests/approved/Determined.candidate.EventListeners.html
rename to DOMEvents/Determined.candidate.EventListeners.html
diff --git a/DOMEvents/tests/approved/Event.bubbles.false.html b/DOMEvents/Event.bubbles.false.html
similarity index 100%
rename from DOMEvents/tests/approved/Event.bubbles.false.html
rename to DOMEvents/Event.bubbles.false.html
diff --git a/DOMEvents/tests/submissions/Microsoft/Event.defaultPrevented.html b/DOMEvents/Event.defaultPrevented.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/Event.defaultPrevented.html
rename to DOMEvents/Event.defaultPrevented.html
diff --git a/DOMEvents/tests/submissions/Microsoft/Event.eventPhase.html b/DOMEvents/Event.eventPhase.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/Event.eventPhase.html
rename to DOMEvents/Event.eventPhase.html
diff --git a/DOMEvents/tests/submissions/Microsoft/Event.stopPropagation.html b/DOMEvents/Event.stopPropagation.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/Event.stopPropagation.html
rename to DOMEvents/Event.stopPropagation.html
diff --git a/DOMEvents/tests/approved/EventListener.dispatch.new.event.html b/DOMEvents/EventListener.dispatch.new.event.html
similarity index 100%
rename from DOMEvents/tests/approved/EventListener.dispatch.new.event.html
rename to DOMEvents/EventListener.dispatch.new.event.html
diff --git a/DOMEvents/tests/approved/EventListener.eventHandler.html b/DOMEvents/EventListener.eventHandler.html
similarity index 100%
rename from DOMEvents/tests/approved/EventListener.eventHandler.html
rename to DOMEvents/EventListener.eventHandler.html
diff --git a/DOMEvents/tests/approved/EventObject.after.dispatchEvent.html b/DOMEvents/EventObject.after.dispatchEvent.html
similarity index 100%
rename from DOMEvents/tests/approved/EventObject.after.dispatchEvent.html
rename to DOMEvents/EventObject.after.dispatchEvent.html
diff --git a/DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html b/DOMEvents/EventObject.multiple.dispatchEvent.html
similarity index 100%
rename from DOMEvents/tests/approved/EventObject.multiple.dispatchEvent.html
rename to DOMEvents/EventObject.multiple.dispatchEvent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.key.html b/DOMEvents/KeyboardEvent.key.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/KeyboardEvent.key.html
rename to DOMEvents/KeyboardEvent.key.html
diff --git a/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.location.html b/DOMEvents/KeyboardEvent.location.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/KeyboardEvent.location.html
rename to DOMEvents/KeyboardEvent.location.html
diff --git a/DOMEvents/tests/submissions/Microsoft/KeyboardEvent.modifiers.html b/DOMEvents/KeyboardEvent.modifiers.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/KeyboardEvent.modifiers.html
rename to DOMEvents/KeyboardEvent.modifiers.html
diff --git a/DOMEvents/tests/submissions/Microsoft/MouseEvent.button.html b/DOMEvents/MouseEvent.button.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/MouseEvent.button.html
rename to DOMEvents/MouseEvent.button.html
diff --git a/DOMEvents/tests/submissions/Microsoft/MouseEvent.image.map.area.html b/DOMEvents/MouseEvent.image.map.area.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/MouseEvent.image.map.area.html
rename to DOMEvents/MouseEvent.image.map.area.html
diff --git a/DOMEvents/tests/submissions/Microsoft/MouseEvent.preventDefault.html b/DOMEvents/MouseEvent.preventDefault.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/MouseEvent.preventDefault.html
rename to DOMEvents/MouseEvent.preventDefault.html
diff --git a/DOMEvents/tests/submissions/Microsoft/MutationEvent.hasFeature.html b/DOMEvents/MutationEvent.hasFeature.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/MutationEvent.hasFeature.html
rename to DOMEvents/MutationEvent.hasFeature.html
diff --git a/DOMEvents/tests/submissions/Microsoft/MutationEvent.initMutationEvent.html b/DOMEvents/MutationEvent.initMutationEvent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/MutationEvent.initMutationEvent.html
rename to DOMEvents/MutationEvent.initMutationEvent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/MutationEvent.relatedNode.html b/DOMEvents/MutationEvent.relatedNode.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/MutationEvent.relatedNode.html
rename to DOMEvents/MutationEvent.relatedNode.html
diff --git a/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html b/DOMEvents/ProcessingInstruction.DOMCharacterDataModified.fail.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.fail.html
rename to DOMEvents/ProcessingInstruction.DOMCharacterDataModified.fail.html
diff --git a/DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html b/DOMEvents/ProcessingInstruction.DOMCharacterDataModified.html
similarity index 100%
rename from DOMEvents/tests/approved/ProcessingInstruction.DOMCharacterDataModified.html
rename to DOMEvents/ProcessingInstruction.DOMCharacterDataModified.html
diff --git a/DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml b/DOMEvents/ProcessingInstruction.DOMCharacterDataModified.xml
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/ProcessingInstruction.DOMCharacterDataModified.xml
rename to DOMEvents/ProcessingInstruction.DOMCharacterDataModified.xml
diff --git a/DOMEvents/tests/approved/Propagation.path.target.moved.html b/DOMEvents/Propagation.path.target.moved.html
similarity index 100%
rename from DOMEvents/tests/approved/Propagation.path.target.moved.html
rename to DOMEvents/Propagation.path.target.moved.html
diff --git a/DOMEvents/tests/approved/Propagation.path.target.removed.html b/DOMEvents/Propagation.path.target.removed.html
similarity index 100%
rename from DOMEvents/tests/approved/Propagation.path.target.removed.html
rename to DOMEvents/Propagation.path.target.removed.html
diff --git a/DOMEvents/tests/submissions/Microsoft/TextEvent.hasFeature.html b/DOMEvents/TextEvent.hasFeature.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/TextEvent.hasFeature.html
rename to DOMEvents/TextEvent.hasFeature.html
diff --git a/DOMEvents/tests/submissions/Microsoft/TextEvent.initTextEvent.html b/DOMEvents/TextEvent.initTextEvent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/TextEvent.initTextEvent.html
rename to DOMEvents/TextEvent.initTextEvent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.IME.html b/DOMEvents/TextEvent.inputMode.IME.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.IME.html
rename to DOMEvents/TextEvent.inputMode.IME.html
diff --git a/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.drop.html b/DOMEvents/TextEvent.inputMode.drop.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.drop.html
rename to DOMEvents/TextEvent.inputMode.drop.html
diff --git a/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html b/DOMEvents/TextEvent.inputMode.keyboard.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.keyboard.html
rename to DOMEvents/TextEvent.inputMode.keyboard.html
diff --git a/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.paste.html b/DOMEvents/TextEvent.inputMode.paste.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.paste.html
rename to DOMEvents/TextEvent.inputMode.paste.html
diff --git a/DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.script.html b/DOMEvents/TextEvent.inputMode.script.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/TextEvent.inputMode.script.html
rename to DOMEvents/TextEvent.inputMode.script.html
diff --git a/DOMEvents/tests/submissions/Microsoft/UIEvent.load.stylesheet.html b/DOMEvents/UIEvent.load.stylesheet.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/UIEvent.load.stylesheet.html
rename to DOMEvents/UIEvent.load.stylesheet.html
diff --git a/DOMEvents/tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html b/DOMEvents/WheelEvent.Capture.Bubble.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/WheelEvent.Capture.Bubble.html
rename to DOMEvents/WheelEvent.Capture.Bubble.html
diff --git a/DOMEvents/tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html b/DOMEvents/WheelEvent.ctrlKey.zoom.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/WheelEvent.ctrlKey.zoom.html
rename to DOMEvents/WheelEvent.ctrlKey.zoom.html
diff --git a/DOMEvents/tests/submissions/Microsoft/WheelEvent.deltaMode.html b/DOMEvents/WheelEvent.deltaMode.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/WheelEvent.deltaMode.html
rename to DOMEvents/WheelEvent.deltaMode.html
diff --git a/DOMEvents/tests/submissions/Microsoft/WheelEvent.hasFeature.html b/DOMEvents/WheelEvent.hasFeature.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/WheelEvent.hasFeature.html
rename to DOMEvents/WheelEvent.hasFeature.html
diff --git a/DOMEvents/tests/submissions/Microsoft/WheelEvent.initWheelEvent.html b/DOMEvents/WheelEvent.initWheelEvent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/WheelEvent.initWheelEvent.html
rename to DOMEvents/WheelEvent.initWheelEvent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html b/DOMEvents/WheelEvent.preventDefault.scroll.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/WheelEvent.preventDefault.scroll.html
rename to DOMEvents/WheelEvent.preventDefault.scroll.html
diff --git a/DOMEvents/tests/submissions/Microsoft/abort.img.html b/DOMEvents/abort.img.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/abort.img.html
rename to DOMEvents/abort.img.html
diff --git a/DOMEvents/tests/submissions/Microsoft/abort.testresult.html b/DOMEvents/abort.testresult.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/abort.testresult.html
rename to DOMEvents/abort.testresult.html
diff --git a/DOMEvents/tests/approved/addEventListener.optional.useCapture.html b/DOMEvents/addEventListener.optional.useCapture.html
similarity index 100%
rename from DOMEvents/tests/approved/addEventListener.optional.useCapture.html
rename to DOMEvents/addEventListener.optional.useCapture.html
diff --git a/DOMEvents/tests/submissions/Microsoft/blur.html b/DOMEvents/blur.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/blur.html
rename to DOMEvents/blur.html
diff --git a/DOMEvents/tests/submissions/Microsoft/compositionstart.data.html b/DOMEvents/compositionstart.data.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/compositionstart.data.html
rename to DOMEvents/compositionstart.data.html
diff --git a/DOMEvents/tests/submissions/Microsoft/compositionstart.keydown.html b/DOMEvents/compositionstart.keydown.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/compositionstart.keydown.html
rename to DOMEvents/compositionstart.keydown.html
diff --git a/DOMEvents/tests/submissions/Microsoft/compositionstart.preventDefault.html b/DOMEvents/compositionstart.preventDefault.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/compositionstart.preventDefault.html
rename to DOMEvents/compositionstart.preventDefault.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html b/DOMEvents/converted/DOM.event.flow.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/DOM.event.flow.html
rename to DOMEvents/converted/DOM.event.flow.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html b/DOMEvents/converted/Determined.candidate.EventListeners.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/Determined.candidate.EventListeners.html
rename to DOMEvents/converted/Determined.candidate.EventListeners.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/Event.bubbles.false.html b/DOMEvents/converted/Event.bubbles.false.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/Event.bubbles.false.html
rename to DOMEvents/converted/Event.bubbles.false.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html b/DOMEvents/converted/EventListener.dispatch.new.event.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/EventListener.dispatch.new.event.html
rename to DOMEvents/converted/EventListener.dispatch.new.event.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html b/DOMEvents/converted/EventListener.eventHandler.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/EventListener.eventHandler.html
rename to DOMEvents/converted/EventListener.eventHandler.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html b/DOMEvents/converted/EventObject.after.dispatchEvent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/EventObject.after.dispatchEvent.html
rename to DOMEvents/converted/EventObject.after.dispatchEvent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html b/DOMEvents/converted/EventObject.multiple.dispatchEvent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/EventObject.multiple.dispatchEvent.html
rename to DOMEvents/converted/EventObject.multiple.dispatchEvent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html b/DOMEvents/converted/ProcessingInstruction.DOMCharacterDataModified.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/ProcessingInstruction.DOMCharacterDataModified.html
rename to DOMEvents/converted/ProcessingInstruction.DOMCharacterDataModified.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html b/DOMEvents/converted/Propagation.path.target.moved.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.moved.html
rename to DOMEvents/converted/Propagation.path.target.moved.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html b/DOMEvents/converted/Propagation.path.target.removed.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/Propagation.path.target.removed.html
rename to DOMEvents/converted/Propagation.path.target.removed.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html b/DOMEvents/converted/addEventListener.optional.useCapture.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/addEventListener.optional.useCapture.html
rename to DOMEvents/converted/addEventListener.optional.useCapture.html
diff --git a/DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html b/DOMEvents/converted/createEvent.NOT_SUPPORTED_ERR.html
similarity index 100%
rename from DOMEvents/tests/approved/createEvent.NOT_SUPPORTED_ERR.html
rename to DOMEvents/converted/createEvent.NOT_SUPPORTED_ERR.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.DISPATCH_REQUEST_ERR.html b/DOMEvents/converted/dispatchEvent.DISPATCH_REQUEST_ERR.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.DISPATCH_REQUEST_ERR.html
rename to DOMEvents/converted/dispatchEvent.DISPATCH_REQUEST_ERR.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html b/DOMEvents/converted/dispatchEvent.NOT_SUPPORTED_ERR.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.NOT_SUPPORTED_ERR.html
rename to DOMEvents/converted/dispatchEvent.NOT_SUPPORTED_ERR.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html b/DOMEvents/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
rename to DOMEvents/converted/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
diff --git a/DOMEvents/tests/approved/dispatchEvent.click.checkbox.html b/DOMEvents/converted/dispatchEvent.click.checkbox.html
similarity index 100%
rename from DOMEvents/tests/approved/dispatchEvent.click.checkbox.html
rename to DOMEvents/converted/dispatchEvent.click.checkbox.html
diff --git a/DOMEvents/tests/approved/dispatchEvent.return.value.html b/DOMEvents/converted/dispatchEvent.return.value.html
similarity index 100%
rename from DOMEvents/tests/approved/dispatchEvent.return.value.html
rename to DOMEvents/converted/dispatchEvent.return.value.html
diff --git a/DOMEvents/tests/approved/domnodeinserted.html b/DOMEvents/converted/domnodeinserted.html
similarity index 100%
rename from DOMEvents/tests/approved/domnodeinserted.html
rename to DOMEvents/converted/domnodeinserted.html
diff --git a/DOMEvents/tests/approved/stopImmediatePropagation.effect.html b/DOMEvents/converted/stopImmediatePropagation.effect.html
similarity index 100%
rename from DOMEvents/tests/approved/stopImmediatePropagation.effect.html
rename to DOMEvents/converted/stopImmediatePropagation.effect.html
diff --git a/DOMEvents/tests/approved/stopPropagation.deferred.effect.html b/DOMEvents/converted/stopPropagation.deferred.effect.html
similarity index 100%
rename from DOMEvents/tests/approved/stopPropagation.deferred.effect.html
rename to DOMEvents/converted/stopPropagation.deferred.effect.html
diff --git a/DOMEvents/tests/approved/stopPropagation.dispatchEvent.html b/DOMEvents/converted/stopPropagation.dispatchEvent.html
similarity index 100%
rename from DOMEvents/tests/approved/stopPropagation.dispatchEvent.html
rename to DOMEvents/converted/stopPropagation.dispatchEvent.html
diff --git a/DOMEvents/tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml b/DOMEvents/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
similarity index 100%
rename from DOMEvents/tests/approved/support/ProcessingInstruction.DOMCharacterDataModified.xml
rename to DOMEvents/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html b/DOMEvents/createEvent.NOT_SUPPORTED_ERR.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/createEvent.NOT_SUPPORTED_ERR.html
rename to DOMEvents/createEvent.NOT_SUPPORTED_ERR.html
diff --git a/DOMEvents/tests/submissions/Microsoft/customevent.html b/DOMEvents/customevent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/customevent.html
rename to DOMEvents/customevent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/dispatchEvent.NOT_SUPPORTED_ERR.html b/DOMEvents/dispatchEvent.NOT_SUPPORTED_ERR.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/dispatchEvent.NOT_SUPPORTED_ERR.html
rename to DOMEvents/dispatchEvent.NOT_SUPPORTED_ERR.html
diff --git a/DOMEvents/tests/submissions/Microsoft/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html b/DOMEvents/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
rename to DOMEvents/dispatchEvent.UNSPECIFIED_EVENT_TYPE_ERR.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html b/DOMEvents/dispatchEvent.click.checkbox.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.click.checkbox.html
rename to DOMEvents/dispatchEvent.click.checkbox.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html b/DOMEvents/dispatchEvent.return.value.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/dispatchEvent.return.value.html
rename to DOMEvents/dispatchEvent.return.value.html
diff --git a/DOMEvents/tests/submissions/Microsoft/error.image.html b/DOMEvents/error.image.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/error.image.html
rename to DOMEvents/error.image.html
diff --git a/DOMEvents/tests/submissions/Microsoft/focusin.html b/DOMEvents/focusin.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/focusin.html
rename to DOMEvents/focusin.html
diff --git a/DOMEvents/tests/submissions/Microsoft/focusin.relatedTarget.html b/DOMEvents/focusin.relatedTarget.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/focusin.relatedTarget.html
rename to DOMEvents/focusin.relatedTarget.html
diff --git a/DOMEvents/tests/submissions/Microsoft/focusout.relatedTarget.html b/DOMEvents/focusout.relatedTarget.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/focusout.relatedTarget.html
rename to DOMEvents/focusout.relatedTarget.html
diff --git a/DOMEvents/tests/submissions/Microsoft/hasFeature.Events.html b/DOMEvents/hasFeature.Events.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/hasFeature.Events.html
rename to DOMEvents/hasFeature.Events.html
diff --git a/DOMEvents/tests/submissions/Microsoft/hasFeature.feature.string.html b/DOMEvents/hasFeature.feature.string.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/hasFeature.feature.string.html
rename to DOMEvents/hasFeature.feature.string.html
diff --git a/DOMEvents/tests/submissions/Microsoft/load.image.html b/DOMEvents/load.image.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/load.image.html
rename to DOMEvents/load.image.html
diff --git a/DOMEvents/tests/submissions/Microsoft/mouseenter.ctrlKey.html b/DOMEvents/mouseenter.ctrlKey.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/mouseenter.ctrlKey.html
rename to DOMEvents/mouseenter.ctrlKey.html
diff --git a/DOMEvents/tests/submissions/Microsoft/mouseenter.relatedTarget.html b/DOMEvents/mouseenter.relatedTarget.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/mouseenter.relatedTarget.html
rename to DOMEvents/mouseenter.relatedTarget.html
diff --git a/DOMEvents/tests/submissions/Microsoft/mouseleave.relatedTarget.html b/DOMEvents/mouseleave.relatedTarget.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/mouseleave.relatedTarget.html
rename to DOMEvents/mouseleave.relatedTarget.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html b/DOMEvents/stopImmediatePropagation.effect.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/stopImmediatePropagation.effect.html
rename to DOMEvents/stopImmediatePropagation.effect.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html b/DOMEvents/stopPropagation.deferred.effect.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.deferred.effect.html
rename to DOMEvents/stopPropagation.deferred.effect.html
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.dispatchEvent.html b/DOMEvents/stopPropagation.dispatchEvent.html
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/stopPropagation.dispatchEvent.html
rename to DOMEvents/stopPropagation.dispatchEvent.html
diff --git a/DOMEvents/tests/submissions/Microsoft/support/16kb.js b/DOMEvents/support/16kb.js
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/support/16kb.js
rename to DOMEvents/support/16kb.js
diff --git a/DOMEvents/tests/submissions/Microsoft/support/InvalidBitMap.png b/DOMEvents/support/InvalidBitMap.png
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/support/InvalidBitMap.png
rename to DOMEvents/support/InvalidBitMap.png
diff --git a/DOMEvents/tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml b/DOMEvents/support/ProcessingInstruction.DOMCharacterDataModified.xml
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/converted/support/ProcessingInstruction.DOMCharacterDataModified.xml
rename to DOMEvents/support/ProcessingInstruction.DOMCharacterDataModified.xml
diff --git a/DOMEvents/tests/submissions/Microsoft/support/iepreview.png b/DOMEvents/support/iepreview.png
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/support/iepreview.png
rename to DOMEvents/support/iepreview.png
diff --git a/DOMEvents/tests/submissions/Microsoft/support/navigate.js b/DOMEvents/support/navigate.js
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/support/navigate.js
rename to DOMEvents/support/navigate.js
diff --git a/DOMEvents/tests/submissions/Microsoft/support/style01.css b/DOMEvents/support/style01.css
similarity index 100%
rename from DOMEvents/tests/submissions/Microsoft/support/style01.css
rename to DOMEvents/support/style01.css
diff --git a/DOMEvents/tests/submissions/Microsoft/createEvent.NOT_SUPPORTED_ERR.html b/DOMEvents/tests/submissions/Microsoft/createEvent.NOT_SUPPORTED_ERR.html
deleted file mode 100644
index 56a804ed7c65ce..00000000000000
--- a/DOMEvents/tests/submissions/Microsoft/createEvent.NOT_SUPPORTED_ERR.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- DOMException.NOT_SUPPORTED_ERR and createEvent()
-
-
-
-
DOM Events
-
- Test Description: createEvent - DOMException NOT_SUPPORTED_ERR raises if the implementation
- does not support the Event interface requested.
-
-
-
Test passes if the word "PASS" appears below.
-
Test result:
-
FAIL
-
-
\ No newline at end of file
diff --git a/DOMEvents/tests/submissions/Microsoft/dispatchEvent.click.checkbox.html b/DOMEvents/tests/submissions/Microsoft/dispatchEvent.click.checkbox.html
deleted file mode 100644
index 75df0038952ff2..00000000000000
--- a/DOMEvents/tests/submissions/Microsoft/dispatchEvent.click.checkbox.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
- MouseEvent: Default action and synthetic click event
-
-
-
-
DOM Events
-
- Test Description: MouseEvent: Default action is performed when a synthetic click event is dispatched on a checkbox element
-
-
-
-
-
-
- Steps:
-
-
Click the button "Click Here"
-
-
-
-
Test passes if the word "PASS" appears below after following the above steps.