diff --git a/css/css-block/OWNERS b/css/css-display/run-in/OWNERS
similarity index 100%
rename from css/css-block/OWNERS
rename to css/css-display/run-in/OWNERS
diff --git a/css/css-block/after-content-display-004.xht b/css/css-display/run-in/after-content-display-004.xht
similarity index 100%
rename from css/css-block/after-content-display-004.xht
rename to css/css-display/run-in/after-content-display-004.xht
diff --git a/css/css-block/anonymous-box-generation-002.xht b/css/css-display/run-in/anonymous-box-generation-002.xht
similarity index 100%
rename from css/css-block/anonymous-box-generation-002.xht
rename to css/css-display/run-in/anonymous-box-generation-002.xht
diff --git a/css/css-block/background-applies-to-011.xht b/css/css-display/run-in/background-applies-to-011.xht
similarity index 100%
rename from css/css-block/background-applies-to-011.xht
rename to css/css-display/run-in/background-applies-to-011.xht
diff --git a/css/css-block/background-attachment-applies-to-011.xht b/css/css-display/run-in/background-attachment-applies-to-011.xht
similarity index 100%
rename from css/css-block/background-attachment-applies-to-011.xht
rename to css/css-display/run-in/background-attachment-applies-to-011.xht
diff --git a/css/css-block/background-color-applies-to-011.xht b/css/css-display/run-in/background-color-applies-to-011.xht
similarity index 100%
rename from css/css-block/background-color-applies-to-011.xht
rename to css/css-display/run-in/background-color-applies-to-011.xht
diff --git a/css/css-block/background-image-applies-to-011.xht b/css/css-display/run-in/background-image-applies-to-011.xht
similarity index 100%
rename from css/css-block/background-image-applies-to-011.xht
rename to css/css-display/run-in/background-image-applies-to-011.xht
diff --git a/css/css-block/background-position-applies-to-011.xht b/css/css-display/run-in/background-position-applies-to-011.xht
similarity index 100%
rename from css/css-block/background-position-applies-to-011.xht
rename to css/css-display/run-in/background-position-applies-to-011.xht
diff --git a/css/css-block/background-repeat-applies-to-011.xht b/css/css-display/run-in/background-repeat-applies-to-011.xht
similarity index 100%
rename from css/css-block/background-repeat-applies-to-011.xht
rename to css/css-display/run-in/background-repeat-applies-to-011.xht
diff --git a/css/css-block/before-content-display-004.xht b/css/css-display/run-in/before-content-display-004.xht
similarity index 100%
rename from css/css-block/before-content-display-004.xht
rename to css/css-display/run-in/before-content-display-004.xht
diff --git a/css/css-block/border-applies-to-011.xht b/css/css-display/run-in/border-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-applies-to-011.xht
rename to css/css-display/run-in/border-applies-to-011.xht
diff --git a/css/css-block/border-bottom-applies-to-011.xht b/css/css-display/run-in/border-bottom-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-bottom-applies-to-011.xht
rename to css/css-display/run-in/border-bottom-applies-to-011.xht
diff --git a/css/css-block/border-bottom-color-applies-to-011.xht b/css/css-display/run-in/border-bottom-color-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-bottom-color-applies-to-011.xht
rename to css/css-display/run-in/border-bottom-color-applies-to-011.xht
diff --git a/css/css-block/border-bottom-style-applies-to-011.xht b/css/css-display/run-in/border-bottom-style-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-bottom-style-applies-to-011.xht
rename to css/css-display/run-in/border-bottom-style-applies-to-011.xht
diff --git a/css/css-block/border-bottom-width-applies-to-011.xht b/css/css-display/run-in/border-bottom-width-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-bottom-width-applies-to-011.xht
rename to css/css-display/run-in/border-bottom-width-applies-to-011.xht
diff --git a/css/css-block/border-collapse-applies-to-004.xht b/css/css-display/run-in/border-collapse-applies-to-004.xht
similarity index 100%
rename from css/css-block/border-collapse-applies-to-004.xht
rename to css/css-display/run-in/border-collapse-applies-to-004.xht
diff --git a/css/css-block/border-color-applies-to-011.xht b/css/css-display/run-in/border-color-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-color-applies-to-011.xht
rename to css/css-display/run-in/border-color-applies-to-011.xht
diff --git a/css/css-block/border-left-applies-to-011.xht b/css/css-display/run-in/border-left-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-left-applies-to-011.xht
rename to css/css-display/run-in/border-left-applies-to-011.xht
diff --git a/css/css-block/border-left-color-applies-to-011.xht b/css/css-display/run-in/border-left-color-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-left-color-applies-to-011.xht
rename to css/css-display/run-in/border-left-color-applies-to-011.xht
diff --git a/css/css-block/border-left-style-applies-to-011.xht b/css/css-display/run-in/border-left-style-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-left-style-applies-to-011.xht
rename to css/css-display/run-in/border-left-style-applies-to-011.xht
diff --git a/css/css-block/border-left-width-applies-to-011.xht b/css/css-display/run-in/border-left-width-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-left-width-applies-to-011.xht
rename to css/css-display/run-in/border-left-width-applies-to-011.xht
diff --git a/css/css-block/border-right-applies-to-011.xht b/css/css-display/run-in/border-right-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-right-applies-to-011.xht
rename to css/css-display/run-in/border-right-applies-to-011.xht
diff --git a/css/css-block/border-right-color-applies-to-011.xht b/css/css-display/run-in/border-right-color-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-right-color-applies-to-011.xht
rename to css/css-display/run-in/border-right-color-applies-to-011.xht
diff --git a/css/css-block/border-right-style-applies-to-011.xht b/css/css-display/run-in/border-right-style-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-right-style-applies-to-011.xht
rename to css/css-display/run-in/border-right-style-applies-to-011.xht
diff --git a/css/css-block/border-right-width-applies-to-011.xht b/css/css-display/run-in/border-right-width-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-right-width-applies-to-011.xht
rename to css/css-display/run-in/border-right-width-applies-to-011.xht
diff --git a/css/css-block/border-spacing-applies-to-004.xht b/css/css-display/run-in/border-spacing-applies-to-004.xht
similarity index 100%
rename from css/css-block/border-spacing-applies-to-004.xht
rename to css/css-display/run-in/border-spacing-applies-to-004.xht
diff --git a/css/css-block/border-style-applies-to-011.xht b/css/css-display/run-in/border-style-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-style-applies-to-011.xht
rename to css/css-display/run-in/border-style-applies-to-011.xht
diff --git a/css/css-block/border-top-applies-to-011.xht b/css/css-display/run-in/border-top-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-top-applies-to-011.xht
rename to css/css-display/run-in/border-top-applies-to-011.xht
diff --git a/css/css-block/border-top-color-applies-to-011.xht b/css/css-display/run-in/border-top-color-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-top-color-applies-to-011.xht
rename to css/css-display/run-in/border-top-color-applies-to-011.xht
diff --git a/css/css-block/border-top-style-applies-to-011.xht b/css/css-display/run-in/border-top-style-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-top-style-applies-to-011.xht
rename to css/css-display/run-in/border-top-style-applies-to-011.xht
diff --git a/css/css-block/border-top-width-applies-to-011.xht b/css/css-display/run-in/border-top-width-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-top-width-applies-to-011.xht
rename to css/css-display/run-in/border-top-width-applies-to-011.xht
diff --git a/css/css-block/border-width-applies-to-011.xht b/css/css-display/run-in/border-width-applies-to-011.xht
similarity index 100%
rename from css/css-block/border-width-applies-to-011.xht
rename to css/css-display/run-in/border-width-applies-to-011.xht
diff --git a/css/css-block/bottom-applies-to-011.xht b/css/css-display/run-in/bottom-applies-to-011.xht
similarity index 100%
rename from css/css-block/bottom-applies-to-011.xht
rename to css/css-display/run-in/bottom-applies-to-011.xht
diff --git a/css/css-block/caption-side-applies-to-004.xht b/css/css-display/run-in/caption-side-applies-to-004.xht
similarity index 100%
rename from css/css-block/caption-side-applies-to-004.xht
rename to css/css-display/run-in/caption-side-applies-to-004.xht
diff --git a/css/css-block/clear-applies-to-011.xht b/css/css-display/run-in/clear-applies-to-011.xht
similarity index 100%
rename from css/css-block/clear-applies-to-011.xht
rename to css/css-display/run-in/clear-applies-to-011.xht
diff --git a/css/css-block/clear-runin-001.xht b/css/css-display/run-in/clear-runin-001.xht
similarity index 100%
rename from css/css-block/clear-runin-001.xht
rename to css/css-display/run-in/clear-runin-001.xht
diff --git a/css/css-block/color-applies-to-011.xht b/css/css-display/run-in/color-applies-to-011.xht
similarity index 100%
rename from css/css-block/color-applies-to-011.xht
rename to css/css-display/run-in/color-applies-to-011.xht
diff --git a/css/css-block/counter-increment-applies-to-011.xht b/css/css-display/run-in/counter-increment-applies-to-011.xht
similarity index 93%
rename from css/css-block/counter-increment-applies-to-011.xht
rename to css/css-display/run-in/counter-increment-applies-to-011.xht
index 9c49195156894e..4bf9e1233fa249 100644
--- a/css/css-block/counter-increment-applies-to-011.xht
+++ b/css/css-display/run-in/counter-increment-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-counter-increment" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters" />
-        <link rel="match" href="../reference/pass_if_number_5.xht"/>
+        <link rel="match" href="../../reference/pass_if_number_5.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'counter-increment' property applies to elements with a 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/counter-reset-applies-to-011.xht b/css/css-display/run-in/counter-reset-applies-to-011.xht
similarity index 93%
rename from css/css-block/counter-reset-applies-to-011.xht
rename to css/css-display/run-in/counter-reset-applies-to-011.xht
index 0ea421547cba41..75a54c93086f7c 100644
--- a/css/css-block/counter-reset-applies-to-011.xht
+++ b/css/css-display/run-in/counter-reset-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-counter-reset" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters" />
-        <link rel="match" href="../reference/pass_if_number_5.xht"/>
+        <link rel="match" href="../../reference/pass_if_number_5.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'counter-reset' property applies to elements with a 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/cursor-applies-to-011.xht b/css/css-display/run-in/cursor-applies-to-011.xht
similarity index 100%
rename from css/css-block/cursor-applies-to-011.xht
rename to css/css-display/run-in/cursor-applies-to-011.xht
diff --git a/css/css-block/direction-applies-to-011.xht b/css/css-display/run-in/direction-applies-to-011.xht
similarity index 100%
rename from css/css-block/direction-applies-to-011.xht
rename to css/css-display/run-in/direction-applies-to-011.xht
diff --git a/css/css-block/display-004.xht b/css/css-display/run-in/display-004.xht
similarity index 100%
rename from css/css-block/display-004.xht
rename to css/css-display/run-in/display-004.xht
diff --git a/css/css-block/empty-cells-applies-to-004.xht b/css/css-display/run-in/empty-cells-applies-to-004.xht
similarity index 100%
rename from css/css-block/empty-cells-applies-to-004.xht
rename to css/css-display/run-in/empty-cells-applies-to-004.xht
diff --git a/css/css-block/first-line-pseudo-009.xht b/css/css-display/run-in/first-line-pseudo-009.xht
similarity index 100%
rename from css/css-block/first-line-pseudo-009.xht
rename to css/css-display/run-in/first-line-pseudo-009.xht
diff --git a/css/css-block/float-applies-to-011.xht b/css/css-display/run-in/float-applies-to-011.xht
similarity index 100%
rename from css/css-block/float-applies-to-011.xht
rename to css/css-display/run-in/float-applies-to-011.xht
diff --git a/css/css-block/font-applies-to-004.xht b/css/css-display/run-in/font-applies-to-004.xht
similarity index 100%
rename from css/css-block/font-applies-to-004.xht
rename to css/css-display/run-in/font-applies-to-004.xht
diff --git a/css/css-block/font-family-applies-to-004.xht b/css/css-display/run-in/font-family-applies-to-004.xht
similarity index 100%
rename from css/css-block/font-family-applies-to-004.xht
rename to css/css-display/run-in/font-family-applies-to-004.xht
diff --git a/css/css-block/font-size-applies-to-004.xht b/css/css-display/run-in/font-size-applies-to-004.xht
similarity index 100%
rename from css/css-block/font-size-applies-to-004.xht
rename to css/css-display/run-in/font-size-applies-to-004.xht
diff --git a/css/css-block/font-style-applies-to-004.xht b/css/css-display/run-in/font-style-applies-to-004.xht
similarity index 92%
rename from css/css-block/font-style-applies-to-004.xht
rename to css/css-display/run-in/font-style-applies-to-004.xht
index e1a50b7e4dc76a..7e9024362ead9e 100644
--- a/css/css-block/font-style-applies-to-004.xht
+++ b/css/css-display/run-in/font-style-applies-to-004.xht
@@ -6,7 +6,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#propdef-font-style" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-styling" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-style-prop"/>
-        <link rel="match" href="../reference/pass_if_filler_text_slanted.xht"/>
+        <link rel="match" href="../../reference/pass_if_filler_text_slanted.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'font-style' property applies to 'display: run-in' elements." />
         <style type="text/css">
diff --git a/css/css-block/font-variant-applies-to-004.xht b/css/css-display/run-in/font-variant-applies-to-004.xht
similarity index 92%
rename from css/css-block/font-variant-applies-to-004.xht
rename to css/css-display/run-in/font-variant-applies-to-004.xht
index adcc7fe57ae84c..15a72afb0e50cc 100644
--- a/css/css-block/font-variant-applies-to-004.xht
+++ b/css/css-display/run-in/font-variant-applies-to-004.xht
@@ -6,7 +6,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#propdef-font-variant" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#small-caps" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-variant-prop" />
-        <link rel="match" href="../reference/pass_if_filler_text_match_smallcaps.xht"/>
+        <link rel="match" href="../../reference/pass_if_filler_text_match_smallcaps.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'font-variant' property applies to 'display: run-in' elements." />
         <style type="text/css">
diff --git a/css/css-block/font-weight-applies-to-004.xht b/css/css-display/run-in/font-weight-applies-to-004.xht
similarity index 92%
rename from css/css-block/font-weight-applies-to-004.xht
rename to css/css-display/run-in/font-weight-applies-to-004.xht
index 57ac352bb0680e..be108161d1558b 100644
--- a/css/css-block/font-weight-applies-to-004.xht
+++ b/css/css-display/run-in/font-weight-applies-to-004.xht
@@ -6,7 +6,7 @@
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#propdef-font-weight" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-boldness" />
         <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-weight-prop" />
-        <link rel="match" href="../reference/pass_if_filler_text_match_bold.xht"/>
+        <link rel="match" href="../../reference/pass_if_filler_text_match_bold.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="Font weights apply to 'display: run-in' elements." />
         <style type="text/css">
diff --git a/css/css-block/height-applies-to-011.xht b/css/css-display/run-in/height-applies-to-011.xht
similarity index 92%
rename from css/css-block/height-applies-to-011.xht
rename to css/css-display/run-in/height-applies-to-011.xht
index ed22bf62c14052..084f4328536ed0 100644
--- a/css/css-block/height-applies-to-011.xht
+++ b/css/css-display/run-in/height-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#propdef-height" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#the-height-property" />
-        <link rel="match" href="../reference/pass_if_square_96px_black.html"/>
+        <link rel="match" href="../../reference/pass_if_square_96px_black.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'height' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/left-applies-to-011.xht b/css/css-display/run-in/left-applies-to-011.xht
similarity index 100%
rename from css/css-block/left-applies-to-011.xht
rename to css/css-display/run-in/left-applies-to-011.xht
diff --git a/css/css-block/letter-spacing-applies-to-004.xht b/css/css-display/run-in/letter-spacing-applies-to-004.xht
similarity index 92%
rename from css/css-block/letter-spacing-applies-to-004.xht
rename to css/css-display/run-in/letter-spacing-applies-to-004.xht
index 2c7ec5340f3f4f..051a2d8451c61e 100644
--- a/css/css-block/letter-spacing-applies-to-004.xht
+++ b/css/css-display/run-in/letter-spacing-applies-to-004.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-letter-spacing" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#spacing-props" />
-        <link rel="match" href="../reference/black_box_ends_when_blue_box_ends_6_boxes_ahem.html"/>
+        <link rel="match" href="../../reference/black_box_ends_when_blue_box_ends_6_boxes_ahem.html"/>
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The 'letter-spacing' property is applied to 'display: run-in' elements." />
         <style type="text/css">
diff --git a/css/css-block/line-height-applies-to-011.xht b/css/css-display/run-in/line-height-applies-to-011.xht
similarity index 100%
rename from css/css-block/line-height-applies-to-011.xht
rename to css/css-display/run-in/line-height-applies-to-011.xht
diff --git a/css/css-block/list-style-applies-to-011.xht b/css/css-display/run-in/list-style-applies-to-011.xht
similarity index 93%
rename from css/css-block/list-style-applies-to-011.xht
rename to css/css-display/run-in/list-style-applies-to-011.xht
index 6aa429cc9a1bc7..f56f5e24a41b6c 100644
--- a/css/css-block/list-style-applies-to-011.xht
+++ b/css/css-display/run-in/list-style-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-list-style" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#list-style" />
-        <link rel="match" href="../reference/single_square_list_marker.xht"/>
+        <link rel="match" href="../../reference/single_square_list_marker.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'list-style' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/list-style-image-applies-to-011.xht b/css/css-display/run-in/list-style-image-applies-to-011.xht
similarity index 100%
rename from css/css-block/list-style-image-applies-to-011.xht
rename to css/css-display/run-in/list-style-image-applies-to-011.xht
diff --git a/css/css-block/list-style-position-applies-to-011.xht b/css/css-display/run-in/list-style-position-applies-to-011.xht
similarity index 100%
rename from css/css-block/list-style-position-applies-to-011.xht
rename to css/css-display/run-in/list-style-position-applies-to-011.xht
diff --git a/css/css-block/list-style-type-applies-to-011.xht b/css/css-display/run-in/list-style-type-applies-to-011.xht
similarity index 93%
rename from css/css-block/list-style-type-applies-to-011.xht
rename to css/css-display/run-in/list-style-type-applies-to-011.xht
index 642b73982f4168..110a0acf30421e 100644
--- a/css/css-block/list-style-type-applies-to-011.xht
+++ b/css/css-display/run-in/list-style-type-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-type" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#list-style" />
-        <link rel="match" href="../reference/single_square_list_marker.xht"/>
+        <link rel="match" href="../../reference/single_square_list_marker.xht"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'list-style-type' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/margin-applies-to-011.xht b/css/css-display/run-in/margin-applies-to-011.xht
similarity index 100%
rename from css/css-block/margin-applies-to-011.xht
rename to css/css-display/run-in/margin-applies-to-011.xht
diff --git a/css/css-block/margin-bottom-applies-to-011.xht b/css/css-display/run-in/margin-bottom-applies-to-011.xht
similarity index 100%
rename from css/css-block/margin-bottom-applies-to-011.xht
rename to css/css-display/run-in/margin-bottom-applies-to-011.xht
diff --git a/css/css-block/margin-left-applies-to-011.xht b/css/css-display/run-in/margin-left-applies-to-011.xht
similarity index 100%
rename from css/css-block/margin-left-applies-to-011.xht
rename to css/css-display/run-in/margin-left-applies-to-011.xht
diff --git a/css/css-block/margin-right-applies-to-011.xht b/css/css-display/run-in/margin-right-applies-to-011.xht
similarity index 100%
rename from css/css-block/margin-right-applies-to-011.xht
rename to css/css-display/run-in/margin-right-applies-to-011.xht
diff --git a/css/css-block/margin-top-applies-to-011.xht b/css/css-display/run-in/margin-top-applies-to-011.xht
similarity index 100%
rename from css/css-block/margin-top-applies-to-011.xht
rename to css/css-display/run-in/margin-top-applies-to-011.xht
diff --git a/css/css-block/max-height-applies-to-011.xht b/css/css-display/run-in/max-height-applies-to-011.xht
similarity index 92%
rename from css/css-block/max-height-applies-to-011.xht
rename to css/css-display/run-in/max-height-applies-to-011.xht
index 80bb7ca7fdf1c0..0145ecf186f7e7 100644
--- a/css/css-block/max-height-applies-to-011.xht
+++ b/css/css-display/run-in/max-height-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#propdef-max-height" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-heights" />
-        <link rel="match" href="../reference/pass_if_square_96px_black.html"/>
+        <link rel="match" href="../../reference/pass_if_square_96px_black.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'max-height' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/max-width-applies-to-011.xht b/css/css-display/run-in/max-width-applies-to-011.xht
similarity index 92%
rename from css/css-block/max-width-applies-to-011.xht
rename to css/css-display/run-in/max-width-applies-to-011.xht
index 926ae993403eb3..089fea0d68f003 100644
--- a/css/css-block/max-width-applies-to-011.xht
+++ b/css/css-display/run-in/max-width-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#propdef-max-width" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths" />
-        <link rel="match" href="../reference/pass_if_square_96px_black.html"/>
+        <link rel="match" href="../../reference/pass_if_square_96px_black.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'max-width' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/min-height-applies-to-011.xht b/css/css-display/run-in/min-height-applies-to-011.xht
similarity index 92%
rename from css/css-block/min-height-applies-to-011.xht
rename to css/css-display/run-in/min-height-applies-to-011.xht
index 42fba493a8c8dd..8d0f0f2134b271 100644
--- a/css/css-block/min-height-applies-to-011.xht
+++ b/css/css-display/run-in/min-height-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#propdef-min-height" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-heights" />
-        <link rel="match" href="../reference/pass_if_square_96px_black.html"/>
+        <link rel="match" href="../../reference/pass_if_square_96px_black.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'min-height' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/min-width-applies-to-011.xht b/css/css-display/run-in/min-width-applies-to-011.xht
similarity index 93%
rename from css/css-block/min-width-applies-to-011.xht
rename to css/css-display/run-in/min-width-applies-to-011.xht
index 18679a9c1d8d6d..2443442d47d2b0 100644
--- a/css/css-block/min-width-applies-to-011.xht
+++ b/css/css-display/run-in/min-width-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#propdef-min-width" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#min-max-widths" />
-        <link rel="match" href="../reference/pass_if_square_96px_black.html"/>
+        <link rel="match" href="../../reference/pass_if_square_96px_black.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'min-width' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/outline-applies-to-011.xht b/css/css-display/run-in/outline-applies-to-011.xht
similarity index 100%
rename from css/css-block/outline-applies-to-011.xht
rename to css/css-display/run-in/outline-applies-to-011.xht
diff --git a/css/css-block/outline-color-applies-to-011.xht b/css/css-display/run-in/outline-color-applies-to-011.xht
similarity index 100%
rename from css/css-block/outline-color-applies-to-011.xht
rename to css/css-display/run-in/outline-color-applies-to-011.xht
diff --git a/css/css-block/outline-style-applies-to-011.xht b/css/css-display/run-in/outline-style-applies-to-011.xht
similarity index 100%
rename from css/css-block/outline-style-applies-to-011.xht
rename to css/css-display/run-in/outline-style-applies-to-011.xht
diff --git a/css/css-block/outline-width-applies-to-011.xht b/css/css-display/run-in/outline-width-applies-to-011.xht
similarity index 100%
rename from css/css-block/outline-width-applies-to-011.xht
rename to css/css-display/run-in/outline-width-applies-to-011.xht
diff --git a/css/css-block/overflow-applies-to-011.xht b/css/css-display/run-in/overflow-applies-to-011.xht
similarity index 100%
rename from css/css-block/overflow-applies-to-011.xht
rename to css/css-display/run-in/overflow-applies-to-011.xht
diff --git a/css/css-block/padding-applies-to-011.xht b/css/css-display/run-in/padding-applies-to-011.xht
similarity index 100%
rename from css/css-block/padding-applies-to-011.xht
rename to css/css-display/run-in/padding-applies-to-011.xht
diff --git a/css/css-block/padding-bottom-applies-to-011.xht b/css/css-display/run-in/padding-bottom-applies-to-011.xht
similarity index 100%
rename from css/css-block/padding-bottom-applies-to-011.xht
rename to css/css-display/run-in/padding-bottom-applies-to-011.xht
diff --git a/css/css-block/padding-left-applies-to-011.xht b/css/css-display/run-in/padding-left-applies-to-011.xht
similarity index 100%
rename from css/css-block/padding-left-applies-to-011.xht
rename to css/css-display/run-in/padding-left-applies-to-011.xht
diff --git a/css/css-block/padding-right-applies-to-011.xht b/css/css-display/run-in/padding-right-applies-to-011.xht
similarity index 100%
rename from css/css-block/padding-right-applies-to-011.xht
rename to css/css-display/run-in/padding-right-applies-to-011.xht
diff --git a/css/css-block/padding-top-applies-to-011.xht b/css/css-display/run-in/padding-top-applies-to-011.xht
similarity index 100%
rename from css/css-block/padding-top-applies-to-011.xht
rename to css/css-display/run-in/padding-top-applies-to-011.xht
diff --git a/css/css-block/position-applies-to-011.xht b/css/css-display/run-in/position-applies-to-011.xht
similarity index 100%
rename from css/css-block/position-applies-to-011.xht
rename to css/css-display/run-in/position-applies-to-011.xht
diff --git a/css/css-block/quotes-applies-to-011.xht b/css/css-display/run-in/quotes-applies-to-011.xht
similarity index 93%
rename from css/css-block/quotes-applies-to-011.xht
rename to css/css-display/run-in/quotes-applies-to-011.xht
index 6bf2faa10586fa..42f426993b5376 100644
--- a/css/css-block/quotes-applies-to-011.xht
+++ b/css/css-display/run-in/quotes-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-quotes" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#quotes-specify" />
-        <link rel="match" href="../reference/pass_if_pass_below.html" />
+        <link rel="match" href="../../reference/pass_if_pass_below.html" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'quotes' property applies to elements with a 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/right-applies-to-011.xht b/css/css-display/run-in/right-applies-to-011.xht
similarity index 100%
rename from css/css-block/right-applies-to-011.xht
rename to css/css-display/run-in/right-applies-to-011.xht
diff --git a/css/css-block/run-in-001.xht b/css/css-display/run-in/run-in-001.xht
similarity index 100%
rename from css/css-block/run-in-001.xht
rename to css/css-display/run-in/run-in-001.xht
diff --git a/css/css-block/run-in-002.xht b/css/css-display/run-in/run-in-002.xht
similarity index 100%
rename from css/css-block/run-in-002.xht
rename to css/css-display/run-in/run-in-002.xht
diff --git a/css/css-block/run-in-003.xht b/css/css-display/run-in/run-in-003.xht
similarity index 100%
rename from css/css-block/run-in-003.xht
rename to css/css-display/run-in/run-in-003.xht
diff --git a/css/css-block/run-in-004.xht b/css/css-display/run-in/run-in-004.xht
similarity index 100%
rename from css/css-block/run-in-004.xht
rename to css/css-display/run-in/run-in-004.xht
diff --git a/css/css-block/run-in-005.xht b/css/css-display/run-in/run-in-005.xht
similarity index 100%
rename from css/css-block/run-in-005.xht
rename to css/css-display/run-in/run-in-005.xht
diff --git a/css/css-block/run-in-006.xht b/css/css-display/run-in/run-in-006.xht
similarity index 100%
rename from css/css-block/run-in-006.xht
rename to css/css-display/run-in/run-in-006.xht
diff --git a/css/css-block/run-in-007.xht b/css/css-display/run-in/run-in-007.xht
similarity index 100%
rename from css/css-block/run-in-007.xht
rename to css/css-display/run-in/run-in-007.xht
diff --git a/css/css-block/run-in-008.xht b/css/css-display/run-in/run-in-008.xht
similarity index 100%
rename from css/css-block/run-in-008.xht
rename to css/css-display/run-in/run-in-008.xht
diff --git a/css/css-block/run-in-009.xht b/css/css-display/run-in/run-in-009.xht
similarity index 100%
rename from css/css-block/run-in-009.xht
rename to css/css-display/run-in/run-in-009.xht
diff --git a/css/css-block/run-in-010.xht b/css/css-display/run-in/run-in-010.xht
similarity index 100%
rename from css/css-block/run-in-010.xht
rename to css/css-display/run-in/run-in-010.xht
diff --git a/css/css-block/run-in-011.xht b/css/css-display/run-in/run-in-011.xht
similarity index 100%
rename from css/css-block/run-in-011.xht
rename to css/css-display/run-in/run-in-011.xht
diff --git a/css/css-block/run-in-012.xht b/css/css-display/run-in/run-in-012.xht
similarity index 100%
rename from css/css-block/run-in-012.xht
rename to css/css-display/run-in/run-in-012.xht
diff --git a/css/css-block/run-in-013.xht b/css/css-display/run-in/run-in-013.xht
similarity index 100%
rename from css/css-block/run-in-013.xht
rename to css/css-display/run-in/run-in-013.xht
diff --git a/css/css-block/run-in-abspos-between-001.xht b/css/css-display/run-in/run-in-abspos-between-001.xht
similarity index 100%
rename from css/css-block/run-in-abspos-between-001.xht
rename to css/css-display/run-in/run-in-abspos-between-001.xht
diff --git a/css/css-block/run-in-abspos-between-002.xht b/css/css-display/run-in/run-in-abspos-between-002.xht
similarity index 100%
rename from css/css-block/run-in-abspos-between-002.xht
rename to css/css-display/run-in/run-in-abspos-between-002.xht
diff --git a/css/css-block/run-in-abspos-between-003.xht b/css/css-display/run-in/run-in-abspos-between-003.xht
similarity index 100%
rename from css/css-block/run-in-abspos-between-003.xht
rename to css/css-display/run-in/run-in-abspos-between-003.xht
diff --git a/css/css-block/run-in-basic-001.xht b/css/css-display/run-in/run-in-basic-001.xht
similarity index 100%
rename from css/css-block/run-in-basic-001.xht
rename to css/css-display/run-in/run-in-basic-001.xht
diff --git a/css/css-block/run-in-basic-002.xht b/css/css-display/run-in/run-in-basic-002.xht
similarity index 100%
rename from css/css-block/run-in-basic-002.xht
rename to css/css-display/run-in/run-in-basic-002.xht
diff --git a/css/css-block/run-in-basic-003.xht b/css/css-display/run-in/run-in-basic-003.xht
similarity index 100%
rename from css/css-block/run-in-basic-003.xht
rename to css/css-display/run-in/run-in-basic-003.xht
diff --git a/css/css-block/run-in-basic-004.xht b/css/css-display/run-in/run-in-basic-004.xht
similarity index 100%
rename from css/css-block/run-in-basic-004.xht
rename to css/css-display/run-in/run-in-basic-004.xht
diff --git a/css/css-block/run-in-basic-005.xht b/css/css-display/run-in/run-in-basic-005.xht
similarity index 100%
rename from css/css-block/run-in-basic-005.xht
rename to css/css-display/run-in/run-in-basic-005.xht
diff --git a/css/css-block/run-in-basic-006.xht b/css/css-display/run-in/run-in-basic-006.xht
similarity index 100%
rename from css/css-block/run-in-basic-006.xht
rename to css/css-display/run-in/run-in-basic-006.xht
diff --git a/css/css-block/run-in-basic-007-ref.xht b/css/css-display/run-in/run-in-basic-007-ref.xht
similarity index 100%
rename from css/css-block/run-in-basic-007-ref.xht
rename to css/css-display/run-in/run-in-basic-007-ref.xht
diff --git a/css/css-block/run-in-basic-007.xht b/css/css-display/run-in/run-in-basic-007.xht
similarity index 100%
rename from css/css-block/run-in-basic-007.xht
rename to css/css-display/run-in/run-in-basic-007.xht
diff --git a/css/css-block/run-in-basic-008.xht b/css/css-display/run-in/run-in-basic-008.xht
similarity index 100%
rename from css/css-block/run-in-basic-008.xht
rename to css/css-display/run-in/run-in-basic-008.xht
diff --git a/css/css-block/run-in-basic-009.xht b/css/css-display/run-in/run-in-basic-009.xht
similarity index 100%
rename from css/css-block/run-in-basic-009.xht
rename to css/css-display/run-in/run-in-basic-009.xht
diff --git a/css/css-block/run-in-basic-010.xht b/css/css-display/run-in/run-in-basic-010.xht
similarity index 100%
rename from css/css-block/run-in-basic-010.xht
rename to css/css-display/run-in/run-in-basic-010.xht
diff --git a/css/css-block/run-in-basic-011.xht b/css/css-display/run-in/run-in-basic-011.xht
similarity index 100%
rename from css/css-block/run-in-basic-011.xht
rename to css/css-display/run-in/run-in-basic-011.xht
diff --git a/css/css-block/run-in-basic-012.xht b/css/css-display/run-in/run-in-basic-012.xht
similarity index 100%
rename from css/css-block/run-in-basic-012.xht
rename to css/css-display/run-in/run-in-basic-012.xht
diff --git a/css/css-block/run-in-basic-013.xht b/css/css-display/run-in/run-in-basic-013.xht
similarity index 100%
rename from css/css-block/run-in-basic-013.xht
rename to css/css-display/run-in/run-in-basic-013.xht
diff --git a/css/css-block/run-in-basic-014.xht b/css/css-display/run-in/run-in-basic-014.xht
similarity index 100%
rename from css/css-block/run-in-basic-014.xht
rename to css/css-display/run-in/run-in-basic-014.xht
diff --git a/css/css-block/run-in-basic-015.xht b/css/css-display/run-in/run-in-basic-015.xht
similarity index 100%
rename from css/css-block/run-in-basic-015.xht
rename to css/css-display/run-in/run-in-basic-015.xht
diff --git a/css/css-block/run-in-basic-016.xht b/css/css-display/run-in/run-in-basic-016.xht
similarity index 100%
rename from css/css-block/run-in-basic-016.xht
rename to css/css-display/run-in/run-in-basic-016.xht
diff --git a/css/css-block/run-in-basic-017.xht b/css/css-display/run-in/run-in-basic-017.xht
similarity index 100%
rename from css/css-block/run-in-basic-017.xht
rename to css/css-display/run-in/run-in-basic-017.xht
diff --git a/css/css-block/run-in-basic-018.xht b/css/css-display/run-in/run-in-basic-018.xht
similarity index 100%
rename from css/css-block/run-in-basic-018.xht
rename to css/css-display/run-in/run-in-basic-018.xht
diff --git a/css/css-block/run-in-basic-ref.xht b/css/css-display/run-in/run-in-basic-ref.xht
similarity index 100%
rename from css/css-block/run-in-basic-ref.xht
rename to css/css-display/run-in/run-in-basic-ref.xht
diff --git a/css/css-block/run-in-block-between-001.xht b/css/css-display/run-in/run-in-block-between-001.xht
similarity index 100%
rename from css/css-block/run-in-block-between-001.xht
rename to css/css-display/run-in/run-in-block-between-001.xht
diff --git a/css/css-block/run-in-block-between-002.xht b/css/css-display/run-in/run-in-block-between-002.xht
similarity index 100%
rename from css/css-block/run-in-block-between-002.xht
rename to css/css-display/run-in/run-in-block-between-002.xht
diff --git a/css/css-block/run-in-block-between-003.xht b/css/css-display/run-in/run-in-block-between-003.xht
similarity index 100%
rename from css/css-block/run-in-block-between-003.xht
rename to css/css-display/run-in/run-in-block-between-003.xht
diff --git a/css/css-block/run-in-block-ref.xht b/css/css-display/run-in/run-in-block-ref.xht
similarity index 100%
rename from css/css-block/run-in-block-ref.xht
rename to css/css-display/run-in/run-in-block-ref.xht
diff --git a/css/css-block/run-in-breaking-001-ref.xht b/css/css-display/run-in/run-in-breaking-001-ref.xht
similarity index 100%
rename from css/css-block/run-in-breaking-001-ref.xht
rename to css/css-display/run-in/run-in-breaking-001-ref.xht
diff --git a/css/css-block/run-in-breaking-001.xht b/css/css-display/run-in/run-in-breaking-001.xht
similarity index 100%
rename from css/css-block/run-in-breaking-001.xht
rename to css/css-display/run-in/run-in-breaking-001.xht
diff --git a/css/css-block/run-in-breaking-002-ref.xht b/css/css-display/run-in/run-in-breaking-002-ref.xht
similarity index 100%
rename from css/css-block/run-in-breaking-002-ref.xht
rename to css/css-display/run-in/run-in-breaking-002-ref.xht
diff --git a/css/css-block/run-in-breaking-002.xht b/css/css-display/run-in/run-in-breaking-002.xht
similarity index 100%
rename from css/css-block/run-in-breaking-002.xht
rename to css/css-display/run-in/run-in-breaking-002.xht
diff --git a/css/css-block/run-in-clear-001.xht b/css/css-display/run-in/run-in-clear-001.xht
similarity index 100%
rename from css/css-block/run-in-clear-001.xht
rename to css/css-display/run-in/run-in-clear-001.xht
diff --git a/css/css-block/run-in-clear-002.xht b/css/css-display/run-in/run-in-clear-002.xht
similarity index 100%
rename from css/css-block/run-in-clear-002.xht
rename to css/css-display/run-in/run-in-clear-002.xht
diff --git a/css/css-block/run-in-contains-abspos-001.xht b/css/css-display/run-in/run-in-contains-abspos-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-abspos-001.xht
rename to css/css-display/run-in/run-in-contains-abspos-001.xht
diff --git a/css/css-block/run-in-contains-block-001.xht b/css/css-display/run-in/run-in-contains-block-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-001.xht
rename to css/css-display/run-in/run-in-contains-block-001.xht
diff --git a/css/css-block/run-in-contains-block-002.xht b/css/css-display/run-in/run-in-contains-block-002.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-002.xht
rename to css/css-display/run-in/run-in-contains-block-002.xht
diff --git a/css/css-block/run-in-contains-block-003.xht b/css/css-display/run-in/run-in-contains-block-003.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-003.xht
rename to css/css-display/run-in/run-in-contains-block-003.xht
diff --git a/css/css-block/run-in-contains-block-004.xht b/css/css-display/run-in/run-in-contains-block-004.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-004.xht
rename to css/css-display/run-in/run-in-contains-block-004.xht
diff --git a/css/css-block/run-in-contains-block-005.xht b/css/css-display/run-in/run-in-contains-block-005.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-005.xht
rename to css/css-display/run-in/run-in-contains-block-005.xht
diff --git a/css/css-block/run-in-contains-block-inside-inline-001.xht b/css/css-display/run-in/run-in-contains-block-inside-inline-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-inside-inline-001.xht
rename to css/css-display/run-in/run-in-contains-block-inside-inline-001.xht
diff --git a/css/css-block/run-in-contains-block-inside-inline-002.xht b/css/css-display/run-in/run-in-contains-block-inside-inline-002.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-inside-inline-002.xht
rename to css/css-display/run-in/run-in-contains-block-inside-inline-002.xht
diff --git a/css/css-block/run-in-contains-block-inside-inline-003.xht b/css/css-display/run-in/run-in-contains-block-inside-inline-003.xht
similarity index 100%
rename from css/css-block/run-in-contains-block-inside-inline-003.xht
rename to css/css-display/run-in/run-in-contains-block-inside-inline-003.xht
diff --git a/css/css-block/run-in-contains-float-001.xht b/css/css-display/run-in/run-in-contains-float-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-float-001.xht
rename to css/css-display/run-in/run-in-contains-float-001.xht
diff --git a/css/css-block/run-in-contains-inline-001.xht b/css/css-display/run-in/run-in-contains-inline-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-001.xht
rename to css/css-display/run-in/run-in-contains-inline-001.xht
diff --git a/css/css-block/run-in-contains-inline-002.xht b/css/css-display/run-in/run-in-contains-inline-002.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-002.xht
rename to css/css-display/run-in/run-in-contains-inline-002.xht
diff --git a/css/css-block/run-in-contains-inline-003.xht b/css/css-display/run-in/run-in-contains-inline-003.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-003.xht
rename to css/css-display/run-in/run-in-contains-inline-003.xht
diff --git a/css/css-block/run-in-contains-inline-004.xht b/css/css-display/run-in/run-in-contains-inline-004.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-004.xht
rename to css/css-display/run-in/run-in-contains-inline-004.xht
diff --git a/css/css-block/run-in-contains-inline-005.xht b/css/css-display/run-in/run-in-contains-inline-005.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-005.xht
rename to css/css-display/run-in/run-in-contains-inline-005.xht
diff --git a/css/css-block/run-in-contains-inline-006.xht b/css/css-display/run-in/run-in-contains-inline-006.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-006.xht
rename to css/css-display/run-in/run-in-contains-inline-006.xht
diff --git a/css/css-block/run-in-contains-inline-007.xht b/css/css-display/run-in/run-in-contains-inline-007.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-007.xht
rename to css/css-display/run-in/run-in-contains-inline-007.xht
diff --git a/css/css-block/run-in-contains-inline-block-001.xht b/css/css-display/run-in/run-in-contains-inline-block-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-block-001.xht
rename to css/css-display/run-in/run-in-contains-inline-block-001.xht
diff --git a/css/css-block/run-in-contains-inline-table-001.xht b/css/css-display/run-in/run-in-contains-inline-table-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-inline-table-001.xht
rename to css/css-display/run-in/run-in-contains-inline-table-001.xht
diff --git a/css/css-block/run-in-contains-relpos-block-001.xht b/css/css-display/run-in/run-in-contains-relpos-block-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-relpos-block-001.xht
rename to css/css-display/run-in/run-in-contains-relpos-block-001.xht
diff --git a/css/css-block/run-in-contains-relpos-block-002.xht b/css/css-display/run-in/run-in-contains-relpos-block-002.xht
similarity index 100%
rename from css/css-block/run-in-contains-relpos-block-002.xht
rename to css/css-display/run-in/run-in-contains-relpos-block-002.xht
diff --git a/css/css-block/run-in-contains-relpos-block-003.xht b/css/css-display/run-in/run-in-contains-relpos-block-003.xht
similarity index 100%
rename from css/css-block/run-in-contains-relpos-block-003.xht
rename to css/css-display/run-in/run-in-contains-relpos-block-003.xht
diff --git a/css/css-block/run-in-contains-run-in-001.xht b/css/css-display/run-in/run-in-contains-run-in-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-run-in-001.xht
rename to css/css-display/run-in/run-in-contains-run-in-001.xht
diff --git a/css/css-block/run-in-contains-run-in-002.xht b/css/css-display/run-in/run-in-contains-run-in-002.xht
similarity index 100%
rename from css/css-block/run-in-contains-run-in-002.xht
rename to css/css-display/run-in/run-in-contains-run-in-002.xht
diff --git a/css/css-block/run-in-contains-run-in-003.xht b/css/css-display/run-in/run-in-contains-run-in-003.xht
similarity index 100%
rename from css/css-block/run-in-contains-run-in-003.xht
rename to css/css-display/run-in/run-in-contains-run-in-003.xht
diff --git a/css/css-block/run-in-contains-table-001.xht b/css/css-display/run-in/run-in-contains-table-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-001.xht
rename to css/css-display/run-in/run-in-contains-table-001.xht
diff --git a/css/css-block/run-in-contains-table-002.xht b/css/css-display/run-in/run-in-contains-table-002.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-002.xht
rename to css/css-display/run-in/run-in-contains-table-002.xht
diff --git a/css/css-block/run-in-contains-table-003.xht b/css/css-display/run-in/run-in-contains-table-003.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-003.xht
rename to css/css-display/run-in/run-in-contains-table-003.xht
diff --git a/css/css-block/run-in-contains-table-caption-001.xht b/css/css-display/run-in/run-in-contains-table-caption-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-caption-001.xht
rename to css/css-display/run-in/run-in-contains-table-caption-001.xht
diff --git a/css/css-block/run-in-contains-table-cell-001.xht b/css/css-display/run-in/run-in-contains-table-cell-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-cell-001.xht
rename to css/css-display/run-in/run-in-contains-table-cell-001.xht
diff --git a/css/css-block/run-in-contains-table-column-001.xht b/css/css-display/run-in/run-in-contains-table-column-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-column-001.xht
rename to css/css-display/run-in/run-in-contains-table-column-001.xht
diff --git a/css/css-block/run-in-contains-table-column-group-001.xht b/css/css-display/run-in/run-in-contains-table-column-group-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-column-group-001.xht
rename to css/css-display/run-in/run-in-contains-table-column-group-001.xht
diff --git a/css/css-block/run-in-contains-table-inside-inline-001.xht b/css/css-display/run-in/run-in-contains-table-inside-inline-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-inside-inline-001.xht
rename to css/css-display/run-in/run-in-contains-table-inside-inline-001.xht
diff --git a/css/css-block/run-in-contains-table-inside-inline-002.xht b/css/css-display/run-in/run-in-contains-table-inside-inline-002.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-inside-inline-002.xht
rename to css/css-display/run-in/run-in-contains-table-inside-inline-002.xht
diff --git a/css/css-block/run-in-contains-table-inside-inline-003.xht b/css/css-display/run-in/run-in-contains-table-inside-inline-003.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-inside-inline-003.xht
rename to css/css-display/run-in/run-in-contains-table-inside-inline-003.xht
diff --git a/css/css-block/run-in-contains-table-row-001.xht b/css/css-display/run-in/run-in-contains-table-row-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-row-001.xht
rename to css/css-display/run-in/run-in-contains-table-row-001.xht
diff --git a/css/css-block/run-in-contains-table-row-group-001.xht b/css/css-display/run-in/run-in-contains-table-row-group-001.xht
similarity index 100%
rename from css/css-block/run-in-contains-table-row-group-001.xht
rename to css/css-display/run-in/run-in-contains-table-row-group-001.xht
diff --git a/css/css-block/run-in-display-none-between-001.xht b/css/css-display/run-in/run-in-display-none-between-001.xht
similarity index 100%
rename from css/css-block/run-in-display-none-between-001.xht
rename to css/css-display/run-in/run-in-display-none-between-001.xht
diff --git a/css/css-block/run-in-display-none-between-002.xht b/css/css-display/run-in/run-in-display-none-between-002.xht
similarity index 100%
rename from css/css-block/run-in-display-none-between-002.xht
rename to css/css-display/run-in/run-in-display-none-between-002.xht
diff --git a/css/css-block/run-in-display-none-between-003.xht b/css/css-display/run-in/run-in-display-none-between-003.xht
similarity index 100%
rename from css/css-block/run-in-display-none-between-003.xht
rename to css/css-display/run-in/run-in-display-none-between-003.xht
diff --git a/css/css-block/run-in-fixedpos-between-001.xht b/css/css-display/run-in/run-in-fixedpos-between-001.xht
similarity index 100%
rename from css/css-block/run-in-fixedpos-between-001.xht
rename to css/css-display/run-in/run-in-fixedpos-between-001.xht
diff --git a/css/css-block/run-in-fixedpos-between-002.xht b/css/css-display/run-in/run-in-fixedpos-between-002.xht
similarity index 100%
rename from css/css-block/run-in-fixedpos-between-002.xht
rename to css/css-display/run-in/run-in-fixedpos-between-002.xht
diff --git a/css/css-block/run-in-fixedpos-between-003.xht b/css/css-display/run-in/run-in-fixedpos-between-003.xht
similarity index 100%
rename from css/css-block/run-in-fixedpos-between-003.xht
rename to css/css-display/run-in/run-in-fixedpos-between-003.xht
diff --git a/css/css-block/run-in-float-between-001.xht b/css/css-display/run-in/run-in-float-between-001.xht
similarity index 100%
rename from css/css-block/run-in-float-between-001.xht
rename to css/css-display/run-in/run-in-float-between-001.xht
diff --git a/css/css-block/run-in-float-between-002.xht b/css/css-display/run-in/run-in-float-between-002.xht
similarity index 100%
rename from css/css-block/run-in-float-between-002.xht
rename to css/css-display/run-in/run-in-float-between-002.xht
diff --git a/css/css-block/run-in-float-between-003.xht b/css/css-display/run-in/run-in-float-between-003.xht
similarity index 100%
rename from css/css-block/run-in-float-between-003.xht
rename to css/css-display/run-in/run-in-float-between-003.xht
diff --git a/css/css-block/run-in-inherit-001-ref.xht b/css/css-display/run-in/run-in-inherit-001-ref.xht
similarity index 100%
rename from css/css-block/run-in-inherit-001-ref.xht
rename to css/css-display/run-in/run-in-inherit-001-ref.xht
diff --git a/css/css-block/run-in-inherit-001.xht b/css/css-display/run-in/run-in-inherit-001.xht
similarity index 100%
rename from css/css-block/run-in-inherit-001.xht
rename to css/css-display/run-in/run-in-inherit-001.xht
diff --git a/css/css-block/run-in-inheritance-001.xht b/css/css-display/run-in/run-in-inheritance-001.xht
similarity index 100%
rename from css/css-block/run-in-inheritance-001.xht
rename to css/css-display/run-in/run-in-inheritance-001.xht
diff --git a/css/css-block/run-in-inline-between-001.xht b/css/css-display/run-in/run-in-inline-between-001.xht
similarity index 100%
rename from css/css-block/run-in-inline-between-001.xht
rename to css/css-display/run-in/run-in-inline-between-001.xht
diff --git a/css/css-block/run-in-inline-between-002.xht b/css/css-display/run-in/run-in-inline-between-002.xht
similarity index 100%
rename from css/css-block/run-in-inline-between-002.xht
rename to css/css-display/run-in/run-in-inline-between-002.xht
diff --git a/css/css-block/run-in-inline-between-003.xht b/css/css-display/run-in/run-in-inline-between-003.xht
similarity index 100%
rename from css/css-block/run-in-inline-between-003.xht
rename to css/css-display/run-in/run-in-inline-between-003.xht
diff --git a/css/css-block/run-in-inline-block-between-001.xht b/css/css-display/run-in/run-in-inline-block-between-001.xht
similarity index 100%
rename from css/css-block/run-in-inline-block-between-001.xht
rename to css/css-display/run-in/run-in-inline-block-between-001.xht
diff --git a/css/css-block/run-in-inline-block-between-002.xht b/css/css-display/run-in/run-in-inline-block-between-002.xht
similarity index 100%
rename from css/css-block/run-in-inline-block-between-002.xht
rename to css/css-display/run-in/run-in-inline-block-between-002.xht
diff --git a/css/css-block/run-in-inline-block-between-003.xht b/css/css-display/run-in/run-in-inline-block-between-003.xht
similarity index 100%
rename from css/css-block/run-in-inline-block-between-003.xht
rename to css/css-display/run-in/run-in-inline-block-between-003.xht
diff --git a/css/css-block/run-in-inline-table-between-001.xht b/css/css-display/run-in/run-in-inline-table-between-001.xht
similarity index 100%
rename from css/css-block/run-in-inline-table-between-001.xht
rename to css/css-display/run-in/run-in-inline-table-between-001.xht
diff --git a/css/css-block/run-in-inline-table-between-002.xht b/css/css-display/run-in/run-in-inline-table-between-002.xht
similarity index 100%
rename from css/css-block/run-in-inline-table-between-002.xht
rename to css/css-display/run-in/run-in-inline-table-between-002.xht
diff --git a/css/css-block/run-in-inline-table-between-003.xht b/css/css-display/run-in/run-in-inline-table-between-003.xht
similarity index 100%
rename from css/css-block/run-in-inline-table-between-003.xht
rename to css/css-display/run-in/run-in-inline-table-between-003.xht
diff --git a/css/css-block/run-in-linebox-001.xht b/css/css-display/run-in/run-in-linebox-001.xht
similarity index 100%
rename from css/css-block/run-in-linebox-001.xht
rename to css/css-display/run-in/run-in-linebox-001.xht
diff --git a/css/css-block/run-in-linebox-002.xht b/css/css-display/run-in/run-in-linebox-002.xht
similarity index 100%
rename from css/css-block/run-in-linebox-002.xht
rename to css/css-display/run-in/run-in-linebox-002.xht
diff --git a/css/css-block/run-in-listitem-between-001.xht b/css/css-display/run-in/run-in-listitem-between-001.xht
similarity index 100%
rename from css/css-block/run-in-listitem-between-001.xht
rename to css/css-display/run-in/run-in-listitem-between-001.xht
diff --git a/css/css-block/run-in-listitem-between-002.xht b/css/css-display/run-in/run-in-listitem-between-002.xht
similarity index 100%
rename from css/css-block/run-in-listitem-between-002.xht
rename to css/css-display/run-in/run-in-listitem-between-002.xht
diff --git a/css/css-block/run-in-listitem-between-003.xht b/css/css-display/run-in/run-in-listitem-between-003.xht
similarity index 100%
rename from css/css-block/run-in-listitem-between-003.xht
rename to css/css-display/run-in/run-in-listitem-between-003.xht
diff --git a/css/css-block/run-in-pre-ref.xht b/css/css-display/run-in/run-in-pre-ref.xht
similarity index 100%
rename from css/css-block/run-in-pre-ref.xht
rename to css/css-display/run-in/run-in-pre-ref.xht
diff --git a/css/css-block/run-in-relpos-between-001.xht b/css/css-display/run-in/run-in-relpos-between-001.xht
similarity index 100%
rename from css/css-block/run-in-relpos-between-001.xht
rename to css/css-display/run-in/run-in-relpos-between-001.xht
diff --git a/css/css-block/run-in-relpos-between-002.xht b/css/css-display/run-in/run-in-relpos-between-002.xht
similarity index 100%
rename from css/css-block/run-in-relpos-between-002.xht
rename to css/css-display/run-in/run-in-relpos-between-002.xht
diff --git a/css/css-block/run-in-relpos-between-003.xht b/css/css-display/run-in/run-in-relpos-between-003.xht
similarity index 100%
rename from css/css-block/run-in-relpos-between-003.xht
rename to css/css-display/run-in/run-in-relpos-between-003.xht
diff --git a/css/css-block/run-in-replaced-001-ref.xht b/css/css-display/run-in/run-in-replaced-001-ref.xht
similarity index 100%
rename from css/css-block/run-in-replaced-001-ref.xht
rename to css/css-display/run-in/run-in-replaced-001-ref.xht
diff --git a/css/css-block/run-in-replaced-001.xht b/css/css-display/run-in/run-in-replaced-001.xht
similarity index 100%
rename from css/css-block/run-in-replaced-001.xht
rename to css/css-display/run-in/run-in-replaced-001.xht
diff --git a/css/css-block/run-in-restyle-001.xht b/css/css-display/run-in/run-in-restyle-001.xht
similarity index 100%
rename from css/css-block/run-in-restyle-001.xht
rename to css/css-display/run-in/run-in-restyle-001.xht
diff --git a/css/css-block/run-in-restyle-002.xht b/css/css-display/run-in/run-in-restyle-002.xht
similarity index 100%
rename from css/css-block/run-in-restyle-002.xht
rename to css/css-display/run-in/run-in-restyle-002.xht
diff --git a/css/css-block/run-in-restyle-003.xht b/css/css-display/run-in/run-in-restyle-003.xht
similarity index 100%
rename from css/css-block/run-in-restyle-003.xht
rename to css/css-display/run-in/run-in-restyle-003.xht
diff --git a/css/css-block/run-in-run-in-between-001.xht b/css/css-display/run-in/run-in-run-in-between-001.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-001.xht
rename to css/css-display/run-in/run-in-run-in-between-001.xht
diff --git a/css/css-block/run-in-run-in-between-002.xht b/css/css-display/run-in/run-in-run-in-between-002.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-002.xht
rename to css/css-display/run-in/run-in-run-in-between-002.xht
diff --git a/css/css-block/run-in-run-in-between-003.xht b/css/css-display/run-in/run-in-run-in-between-003.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-003.xht
rename to css/css-display/run-in/run-in-run-in-between-003.xht
diff --git a/css/css-block/run-in-run-in-between-004.xht b/css/css-display/run-in/run-in-run-in-between-004.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-004.xht
rename to css/css-display/run-in/run-in-run-in-between-004.xht
diff --git a/css/css-block/run-in-run-in-between-005.xht b/css/css-display/run-in/run-in-run-in-between-005.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-005.xht
rename to css/css-display/run-in/run-in-run-in-between-005.xht
diff --git a/css/css-block/run-in-run-in-between-006.xht b/css/css-display/run-in/run-in-run-in-between-006.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-006.xht
rename to css/css-display/run-in/run-in-run-in-between-006.xht
diff --git a/css/css-block/run-in-run-in-between-007.xht b/css/css-display/run-in/run-in-run-in-between-007.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-007.xht
rename to css/css-display/run-in/run-in-run-in-between-007.xht
diff --git a/css/css-block/run-in-run-in-between-008.xht b/css/css-display/run-in/run-in-run-in-between-008.xht
similarity index 100%
rename from css/css-block/run-in-run-in-between-008.xht
rename to css/css-display/run-in/run-in-run-in-between-008.xht
diff --git a/css/css-block/run-in-table-between-001.xht b/css/css-display/run-in/run-in-table-between-001.xht
similarity index 100%
rename from css/css-block/run-in-table-between-001.xht
rename to css/css-display/run-in/run-in-table-between-001.xht
diff --git a/css/css-block/run-in-table-between-002.xht b/css/css-display/run-in/run-in-table-between-002.xht
similarity index 100%
rename from css/css-block/run-in-table-between-002.xht
rename to css/css-display/run-in/run-in-table-between-002.xht
diff --git a/css/css-block/run-in-table-between-003.xht b/css/css-display/run-in/run-in-table-between-003.xht
similarity index 100%
rename from css/css-block/run-in-table-between-003.xht
rename to css/css-display/run-in/run-in-table-between-003.xht
diff --git a/css/css-block/run-in-table-cell-between-001.xht b/css/css-display/run-in/run-in-table-cell-between-001.xht
similarity index 100%
rename from css/css-block/run-in-table-cell-between-001.xht
rename to css/css-display/run-in/run-in-table-cell-between-001.xht
diff --git a/css/css-block/run-in-table-cell-between-002.xht b/css/css-display/run-in/run-in-table-cell-between-002.xht
similarity index 100%
rename from css/css-block/run-in-table-cell-between-002.xht
rename to css/css-display/run-in/run-in-table-cell-between-002.xht
diff --git a/css/css-block/run-in-table-cell-between-003.xht b/css/css-display/run-in/run-in-table-cell-between-003.xht
similarity index 100%
rename from css/css-block/run-in-table-cell-between-003.xht
rename to css/css-display/run-in/run-in-table-cell-between-003.xht
diff --git a/css/css-block/run-in-table-row-between-001.xht b/css/css-display/run-in/run-in-table-row-between-001.xht
similarity index 100%
rename from css/css-block/run-in-table-row-between-001.xht
rename to css/css-display/run-in/run-in-table-row-between-001.xht
diff --git a/css/css-block/run-in-table-row-between-002.xht b/css/css-display/run-in/run-in-table-row-between-002.xht
similarity index 100%
rename from css/css-block/run-in-table-row-between-002.xht
rename to css/css-display/run-in/run-in-table-row-between-002.xht
diff --git a/css/css-block/run-in-table-row-between-003.xht b/css/css-display/run-in/run-in-table-row-between-003.xht
similarity index 100%
rename from css/css-block/run-in-table-row-between-003.xht
rename to css/css-display/run-in/run-in-table-row-between-003.xht
diff --git a/css/css-block/run-in-text-between-001.xht b/css/css-display/run-in/run-in-text-between-001.xht
similarity index 100%
rename from css/css-block/run-in-text-between-001.xht
rename to css/css-display/run-in/run-in-text-between-001.xht
diff --git a/css/css-block/run-in-text-between-002.xht b/css/css-display/run-in/run-in-text-between-002.xht
similarity index 100%
rename from css/css-block/run-in-text-between-002.xht
rename to css/css-display/run-in/run-in-text-between-002.xht
diff --git a/css/css-block/run-in-text-between-003.xht b/css/css-display/run-in/run-in-text-between-003.xht
similarity index 100%
rename from css/css-block/run-in-text-between-003.xht
rename to css/css-display/run-in/run-in-text-between-003.xht
diff --git a/css/css-block/run-in-text-between-004.xht b/css/css-display/run-in/run-in-text-between-004.xht
similarity index 100%
rename from css/css-block/run-in-text-between-004.xht
rename to css/css-display/run-in/run-in-text-between-004.xht
diff --git a/css/css-block/run-in-text-between-005.xht b/css/css-display/run-in/run-in-text-between-005.xht
similarity index 100%
rename from css/css-block/run-in-text-between-005.xht
rename to css/css-display/run-in/run-in-text-between-005.xht
diff --git a/css/css-block/run-in-text-ref.xht b/css/css-display/run-in/run-in-text-ref.xht
similarity index 100%
rename from css/css-block/run-in-text-ref.xht
rename to css/css-display/run-in/run-in-text-ref.xht
diff --git a/css/css-block/support/black15x15.png b/css/css-display/run-in/support/black15x15.png
similarity index 100%
rename from css/css-block/support/black15x15.png
rename to css/css-display/run-in/support/black15x15.png
diff --git a/css/css-block/support/blue15x15.png b/css/css-display/run-in/support/blue15x15.png
similarity index 100%
rename from css/css-block/support/blue15x15.png
rename to css/css-display/run-in/support/blue15x15.png
diff --git a/css/css-block/support/blue96x96.png b/css/css-display/run-in/support/blue96x96.png
similarity index 100%
rename from css/css-block/support/blue96x96.png
rename to css/css-display/run-in/support/blue96x96.png
diff --git a/css/css-block/support/green15x15.png b/css/css-display/run-in/support/green15x15.png
similarity index 100%
rename from css/css-block/support/green15x15.png
rename to css/css-display/run-in/support/green15x15.png
diff --git a/css/css-block/support/swatch-blue.png b/css/css-display/run-in/support/swatch-blue.png
similarity index 100%
rename from css/css-block/support/swatch-blue.png
rename to css/css-display/run-in/support/swatch-blue.png
diff --git a/css/css-block/table-anonymous-block-001.xht b/css/css-display/run-in/table-anonymous-block-001.xht
similarity index 100%
rename from css/css-block/table-anonymous-block-001.xht
rename to css/css-display/run-in/table-anonymous-block-001.xht
diff --git a/css/css-block/table-layout-applies-to-004.xht b/css/css-display/run-in/table-layout-applies-to-004.xht
similarity index 100%
rename from css/css-block/table-layout-applies-to-004.xht
rename to css/css-display/run-in/table-layout-applies-to-004.xht
diff --git a/css/css-block/text-align-applies-to-004.xht b/css/css-display/run-in/text-align-applies-to-004.xht
similarity index 100%
rename from css/css-block/text-align-applies-to-004.xht
rename to css/css-display/run-in/text-align-applies-to-004.xht
diff --git a/css/css-block/text-decoration-applies-to-004.xht b/css/css-display/run-in/text-decoration-applies-to-004.xht
similarity index 91%
rename from css/css-block/text-decoration-applies-to-004.xht
rename to css/css-display/run-in/text-decoration-applies-to-004.xht
index f06276032e65ac..94aeff8d910b73 100644
--- a/css/css-block/text-decoration-applies-to-004.xht
+++ b/css/css-display/run-in/text-decoration-applies-to-004.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-text-decoration" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#lining-striking-props" />
-        <link rel="match" href="../reference/pass_if_filler_text_underlined.html"/>
+        <link rel="match" href="../../reference/pass_if_filler_text_underlined.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-decoration' property applies to a 'run-in' element." />
         <style type="text/css">
diff --git a/css/css-block/text-indent-applies-to-004.xht b/css/css-display/run-in/text-indent-applies-to-004.xht
similarity index 100%
rename from css/css-block/text-indent-applies-to-004.xht
rename to css/css-display/run-in/text-indent-applies-to-004.xht
diff --git a/css/css-block/text-transform-applies-to-004.xht b/css/css-display/run-in/text-transform-applies-to-004.xht
similarity index 92%
rename from css/css-block/text-transform-applies-to-004.xht
rename to css/css-display/run-in/text-transform-applies-to-004.xht
index b6ff7f82ce343c..bfbc7b128636ba 100644
--- a/css/css-block/text-transform-applies-to-004.xht
+++ b/css/css-display/run-in/text-transform-applies-to-004.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#propdef-text-transform" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#caps-prop" />
-        <link rel="match" href="../reference/pass_if_letter_uppercase.html" />
+        <link rel="match" href="../../reference/pass_if_letter_uppercase.html" />
         <meta name="flags" content="" />
         <meta name="assert" content="The 'text-transform' property is applied to 'display: run-in' elements." />
         <style type="text/css">
diff --git a/css/css-block/top-applies-to-011.xht b/css/css-display/run-in/top-applies-to-011.xht
similarity index 100%
rename from css/css-block/top-applies-to-011.xht
rename to css/css-display/run-in/top-applies-to-011.xht
diff --git a/css/css-block/unicode-bidi-applies-to-011.xht b/css/css-display/run-in/unicode-bidi-applies-to-011.xht
similarity index 100%
rename from css/css-block/unicode-bidi-applies-to-011.xht
rename to css/css-display/run-in/unicode-bidi-applies-to-011.xht
diff --git a/css/css-block/vertical-align-applies-to-011.xht b/css/css-display/run-in/vertical-align-applies-to-011.xht
similarity index 100%
rename from css/css-block/vertical-align-applies-to-011.xht
rename to css/css-display/run-in/vertical-align-applies-to-011.xht
diff --git a/css/css-block/visibility-applies-to-011.xht b/css/css-display/run-in/visibility-applies-to-011.xht
similarity index 100%
rename from css/css-block/visibility-applies-to-011.xht
rename to css/css-display/run-in/visibility-applies-to-011.xht
diff --git a/css/css-block/white-space-applies-to-004.xht b/css/css-display/run-in/white-space-applies-to-004.xht
similarity index 100%
rename from css/css-block/white-space-applies-to-004.xht
rename to css/css-display/run-in/white-space-applies-to-004.xht
diff --git a/css/css-block/width-applies-to-011.xht b/css/css-display/run-in/width-applies-to-011.xht
similarity index 92%
rename from css/css-block/width-applies-to-011.xht
rename to css/css-display/run-in/width-applies-to-011.xht
index 542bdeeae90386..9e5da720f83d74 100644
--- a/css/css-block/width-applies-to-011.xht
+++ b/css/css-display/run-in/width-applies-to-011.xht
@@ -5,7 +5,7 @@
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#propdef-width" />
         <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#the-width-property" />
-        <link rel="match" href="../reference/pass_if_square_96px_black.html"/>
+        <link rel="match" href="../../reference/pass_if_square_96px_black.html"/>
         <meta name="flags" content="" />
         <meta name="assert" content="The 'width' property applies to elements with 'display' set to 'run-in'." />
         <style type="text/css">
diff --git a/css/css-block/word-spacing-applies-to-004.xht b/css/css-display/run-in/word-spacing-applies-to-004.xht
similarity index 100%
rename from css/css-block/word-spacing-applies-to-004.xht
rename to css/css-display/run-in/word-spacing-applies-to-004.xht
diff --git a/css/css-block/z-index-applies-to-011.xht b/css/css-display/run-in/z-index-applies-to-011.xht
similarity index 100%
rename from css/css-block/z-index-applies-to-011.xht
rename to css/css-display/run-in/z-index-applies-to-011.xht