diff --git a/old-tests/submission/Ms2ger/loading-web-pages/browsing-the-web/MANIFEST b/html/browsers/browsing-the-web/read-text/MANIFEST
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/browsing-the-web/MANIFEST
rename to html/browsers/browsing-the-web/read-text/MANIFEST
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/browsing-the-web/load-text-plain.html b/html/browsers/browsing-the-web/read-text/load-text-plain.html
similarity index 91%
rename from old-tests/submission/Ms2ger/loading-web-pages/browsing-the-web/load-text-plain.html
rename to html/browsers/browsing-the-web/read-text/load-text-plain.html
index cb9961d491f07c..d5731129b2323d 100644
--- a/old-tests/submission/Ms2ger/loading-web-pages/browsing-the-web/load-text-plain.html
+++ b/html/browsers/browsing-the-web/read-text/load-text-plain.html
@@ -32,9 +32,10 @@
     tD.done();
   })
   tC.step(function() {
-    assert_equals(doc.documentElement.lastChild.firstChild.firstChild.data, "Text\n");
+    assert_equals(doc.documentElement.lastChild.firstChild.firstChild.data,
+                  "This is a sample text/plain document.\n\nThis is not an HTML document.\n\n");
     tC.done();
   })
 };
-iframe.src = "../../support/text/200-textplain.cgi";
+iframe.src = "../../../../common/text-plain.txt";
 </script>
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/session-history-and-navigation/the-location-interface/MANIFEST b/html/browsers/history/the-location-interface/MANIFEST
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/session-history-and-navigation/the-location-interface/MANIFEST
rename to html/browsers/history/the-location-interface/MANIFEST
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/session-history-and-navigation/the-location-interface/location-stringifier.html b/html/browsers/history/the-location-interface/location-stringifier.html
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/session-history-and-navigation/the-location-interface/location-stringifier.html
rename to html/browsers/history/the-location-interface/location-stringifier.html
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/the-window-object/MANIFEST b/html/browsers/the-window-object/MANIFEST
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/the-window-object/MANIFEST
rename to html/browsers/the-window-object/MANIFEST
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-indexed-properties-strict.html b/html/browsers/the-window-object/window-indexed-properties-strict.html
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-indexed-properties-strict.html
rename to html/browsers/the-window-object/window-indexed-properties-strict.html
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-indexed-properties.html b/html/browsers/the-window-object/window-indexed-properties.html
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-indexed-properties.html
rename to html/browsers/the-window-object/window-indexed-properties.html
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-named-properties.html b/html/browsers/the-window-object/window-named-properties.html
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-named-properties.html
rename to html/browsers/the-window-object/window-named-properties.html
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-properties.html b/html/browsers/the-window-object/window-properties.html
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-properties.html
rename to html/browsers/the-window-object/window-properties.html
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-prototype-chain.html b/html/browsers/the-window-object/window-prototype-chain.html
similarity index 100%
rename from old-tests/submission/Ms2ger/loading-web-pages/the-window-object/window-prototype-chain.html
rename to html/browsers/the-window-object/window-prototype-chain.html
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/MANIFEST b/html/editing/the-hidden-attribute/MANIFEST
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/MANIFEST
rename to html/editing/the-hidden-attribute/MANIFEST
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1-ref.html b/html/editing/the-hidden-attribute/hidden-1-ref.html
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1-ref.html
rename to html/editing/the-hidden-attribute/hidden-1-ref.html
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1a.html b/html/editing/the-hidden-attribute/hidden-1a.html
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1a.html
rename to html/editing/the-hidden-attribute/hidden-1a.html
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1b.html b/html/editing/the-hidden-attribute/hidden-1b.html
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1b.html
rename to html/editing/the-hidden-attribute/hidden-1b.html
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1c.html b/html/editing/the-hidden-attribute/hidden-1c.html
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1c.html
rename to html/editing/the-hidden-attribute/hidden-1c.html
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1d.html b/html/editing/the-hidden-attribute/hidden-1d.html
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/hidden-1d.html
rename to html/editing/the-hidden-attribute/hidden-1d.html
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/hidden-2-ref.svg b/html/editing/the-hidden-attribute/hidden-2-ref.svg
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/hidden-2-ref.svg
rename to html/editing/the-hidden-attribute/hidden-2-ref.svg
diff --git a/old-tests/submission/Ms2ger/the-hidden-attribute/hidden-2.svg b/html/editing/the-hidden-attribute/hidden-2.svg
similarity index 100%
rename from old-tests/submission/Ms2ger/the-hidden-attribute/hidden-2.svg
rename to html/editing/the-hidden-attribute/hidden-2.svg
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/MANIFEST b/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/MANIFEST
similarity index 100%
rename from old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/MANIFEST
rename to html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/MANIFEST
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html b/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html
similarity index 100%
rename from old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html
rename to html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-01.html
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html b/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
similarity index 100%
rename from old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
rename to html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-02.html
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html b/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
similarity index 100%
rename from old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
rename to html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-03.html
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html b/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html
similarity index 100%
rename from old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html
rename to html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/document-color-04.html
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html b/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html
similarity index 100%
rename from old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html
rename to html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/heading-obsolete-attributes-01.html
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html b/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
similarity index 100%
rename from old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
rename to html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
diff --git a/html/rendering/non-replaced-elements/flow-content-0/MANIFEST b/html/rendering/non-replaced-elements/flow-content-0/MANIFEST
new file mode 100644
index 00000000000000..e2349e2aa11d3b
--- /dev/null
+++ b/html/rendering/non-replaced-elements/flow-content-0/MANIFEST
@@ -0,0 +1 @@
+ref figure.html == figure-ref.html
diff --git a/old-tests/submission/Ms2ger/rendering/figure-ref.html b/html/rendering/non-replaced-elements/flow-content-0/figure-ref.html
similarity index 100%
rename from old-tests/submission/Ms2ger/rendering/figure-ref.html
rename to html/rendering/non-replaced-elements/flow-content-0/figure-ref.html
diff --git a/old-tests/submission/Ms2ger/rendering/figure.html b/html/rendering/non-replaced-elements/flow-content-0/figure.html
similarity index 100%
rename from old-tests/submission/Ms2ger/rendering/figure.html
rename to html/rendering/non-replaced-elements/flow-content-0/figure.html
diff --git a/old-tests/submission/Ms2ger/rendering/TODO-lists.html b/html/rendering/non-replaced-elements/lists/TODO-lists.html
similarity index 100%
rename from old-tests/submission/Ms2ger/rendering/TODO-lists.html
rename to html/rendering/non-replaced-elements/lists/TODO-lists.html
diff --git a/old-tests/submission/Ms2ger/rendering/MANIFEST b/html/rendering/non-replaced-elements/tables/MANIFEST
similarity index 53%
rename from old-tests/submission/Ms2ger/rendering/MANIFEST
rename to html/rendering/non-replaced-elements/tables/MANIFEST
index af74374a8cf025..17698b0803d5a3 100644
--- a/old-tests/submission/Ms2ger/rendering/MANIFEST
+++ b/html/rendering/non-replaced-elements/tables/MANIFEST
@@ -1,3 +1 @@
 ref table-width-150percent.html == table-width-150percent-ref.html
-ref figure.html == figure-ref.html
-manual TODO-lists.html
diff --git a/old-tests/submission/Ms2ger/rendering/table-width-150percent-ref.html b/html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html
similarity index 100%
rename from old-tests/submission/Ms2ger/rendering/table-width-150percent-ref.html
rename to html/rendering/non-replaced-elements/tables/table-width-150percent-ref.html
diff --git a/old-tests/submission/Ms2ger/rendering/table-width-150percent.html b/html/rendering/non-replaced-elements/tables/table-width-150percent.html
similarity index 100%
rename from old-tests/submission/Ms2ger/rendering/table-width-150percent.html
rename to html/rendering/non-replaced-elements/tables/table-width-150percent.html
diff --git a/html/webappapis/scripting/events/MANIFEST b/html/webappapis/scripting/events/MANIFEST
index 86caee2bde1715..4912e9445aec98 100644
--- a/html/webappapis/scripting/events/MANIFEST
+++ b/html/webappapis/scripting/events/MANIFEST
@@ -1 +1,3 @@
+body-onload.html
 event-handler-javascript.html
+event-handler-spec-example.html
diff --git a/old-tests/submission/Ms2ger/events/event-handler-spec-example.html b/html/webappapis/scripting/events/event-handler-spec-example.html
similarity index 100%
rename from old-tests/submission/Ms2ger/events/event-handler-spec-example.html
rename to html/webappapis/scripting/events/event-handler-spec-example.html
diff --git a/old-tests/submission/Ms2ger/timers/MANIFEST b/html/webappapis/timers/MANIFEST
similarity index 100%
rename from old-tests/submission/Ms2ger/timers/MANIFEST
rename to html/webappapis/timers/MANIFEST
diff --git a/old-tests/submission/Ms2ger/timers/evil-spec-example.html b/html/webappapis/timers/evil-spec-example.html
similarity index 100%
rename from old-tests/submission/Ms2ger/timers/evil-spec-example.html
rename to html/webappapis/timers/evil-spec-example.html
diff --git a/old-tests/submission/Ms2ger/events/MANIFEST b/old-tests/submission/Ms2ger/events/MANIFEST
deleted file mode 100644
index ea8139665171f8..00000000000000
--- a/old-tests/submission/Ms2ger/events/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-event-handler-spec-example.html
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/MANIFEST b/old-tests/submission/Ms2ger/loading-web-pages/MANIFEST
deleted file mode 100644
index 1c2b50e67754b7..00000000000000
--- a/old-tests/submission/Ms2ger/loading-web-pages/MANIFEST
+++ /dev/null
@@ -1,3 +0,0 @@
-dir browsing-the-web
-dir session-history-and-navigation
-dir the-window-object
diff --git a/old-tests/submission/Ms2ger/loading-web-pages/session-history-and-navigation/MANIFEST b/old-tests/submission/Ms2ger/loading-web-pages/session-history-and-navigation/MANIFEST
deleted file mode 100644
index b0392d5b5aea51..00000000000000
--- a/old-tests/submission/Ms2ger/loading-web-pages/session-history-and-navigation/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-dir the-location-interface
diff --git a/old-tests/submission/Ms2ger/obsolete-features/MANIFEST b/old-tests/submission/Ms2ger/obsolete-features/MANIFEST
deleted file mode 100644
index ecfd1889e67922..00000000000000
--- a/old-tests/submission/Ms2ger/obsolete-features/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-dir requirements-for-implementations
diff --git a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/MANIFEST b/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/MANIFEST
deleted file mode 100644
index 58d71dd5f5b44a..00000000000000
--- a/old-tests/submission/Ms2ger/obsolete-features/requirements-for-implementations/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-dir other-elements-attributes-and-apis
diff --git a/old-tests/submission/Ms2ger/parsing/MANIFEST b/old-tests/submission/Ms2ger/parsing/MANIFEST
deleted file mode 100644
index 2a5aca5be6da88..00000000000000
--- a/old-tests/submission/Ms2ger/parsing/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-parser comment.dat
diff --git a/old-tests/submission/Ms2ger/parsing/comment.dat b/old-tests/submission/Ms2ger/parsing/comment.dat
deleted file mode 100644
index acfcd2e6772788..00000000000000
--- a/old-tests/submission/Ms2ger/parsing/comment.dat
+++ /dev/null
@@ -1,10 +0,0 @@
-#data
-<html><!-- comment --><title>Comment before head</title>
-#errors
-#document
-| <html>
-|   <!-- comment -->
-|   <head>
-|     <title>
-|       "Comment before head"
-|   <body>