diff --git a/spec/basic/00_empty.hrx b/spec/non_conformant/basic/00_empty.hrx
similarity index 100%
rename from spec/basic/00_empty.hrx
rename to spec/non_conformant/basic/00_empty.hrx
diff --git a/spec/basic/01_simple_css.hrx b/spec/non_conformant/basic/01_simple_css.hrx
similarity index 100%
rename from spec/basic/01_simple_css.hrx
rename to spec/non_conformant/basic/01_simple_css.hrx
diff --git a/spec/basic/02_simple_nesting.hrx b/spec/non_conformant/basic/02_simple_nesting.hrx
similarity index 100%
rename from spec/basic/02_simple_nesting.hrx
rename to spec/non_conformant/basic/02_simple_nesting.hrx
diff --git a/spec/basic/03_simple_variable.hrx b/spec/non_conformant/basic/03_simple_variable.hrx
similarity index 100%
rename from spec/basic/03_simple_variable.hrx
rename to spec/non_conformant/basic/03_simple_variable.hrx
diff --git a/spec/basic/04_basic_variables.hrx b/spec/non_conformant/basic/04_basic_variables.hrx
similarity index 100%
rename from spec/basic/04_basic_variables.hrx
rename to spec/non_conformant/basic/04_basic_variables.hrx
diff --git a/spec/basic/05_empty_levels.hrx b/spec/non_conformant/basic/05_empty_levels.hrx
similarity index 100%
rename from spec/basic/05_empty_levels.hrx
rename to spec/non_conformant/basic/05_empty_levels.hrx
diff --git a/spec/basic/06_nesting_and_comments.hrx b/spec/non_conformant/basic/06_nesting_and_comments.hrx
similarity index 100%
rename from spec/basic/06_nesting_and_comments.hrx
rename to spec/non_conformant/basic/06_nesting_and_comments.hrx
diff --git a/spec/basic/07_nested_simple_selector_groups.hrx b/spec/non_conformant/basic/07_nested_simple_selector_groups.hrx
similarity index 100%
rename from spec/basic/07_nested_simple_selector_groups.hrx
rename to spec/non_conformant/basic/07_nested_simple_selector_groups.hrx
diff --git a/spec/basic/08_selector_combinators.hrx b/spec/non_conformant/basic/08_selector_combinators.hrx
similarity index 100%
rename from spec/basic/08_selector_combinators.hrx
rename to spec/non_conformant/basic/08_selector_combinators.hrx
diff --git a/spec/basic/09_selector_groups_and_combinators.hrx b/spec/non_conformant/basic/09_selector_groups_and_combinators.hrx
similarity index 100%
rename from spec/basic/09_selector_groups_and_combinators.hrx
rename to spec/non_conformant/basic/09_selector_groups_and_combinators.hrx
diff --git a/spec/basic/10_classes_and_ids.hrx b/spec/non_conformant/basic/10_classes_and_ids.hrx
similarity index 100%
rename from spec/basic/10_classes_and_ids.hrx
rename to spec/non_conformant/basic/10_classes_and_ids.hrx
diff --git a/spec/basic/11_attribute_selectors.hrx b/spec/non_conformant/basic/11_attribute_selectors.hrx
similarity index 100%
rename from spec/basic/11_attribute_selectors.hrx
rename to spec/non_conformant/basic/11_attribute_selectors.hrx
diff --git a/spec/basic/12_pseudo_classes_and_elements.hrx b/spec/non_conformant/basic/12_pseudo_classes_and_elements.hrx
similarity index 100%
rename from spec/basic/12_pseudo_classes_and_elements.hrx
rename to spec/non_conformant/basic/12_pseudo_classes_and_elements.hrx
diff --git a/spec/basic/13_back_references.hrx b/spec/non_conformant/basic/13_back_references.hrx
similarity index 100%
rename from spec/basic/13_back_references.hrx
rename to spec/non_conformant/basic/13_back_references.hrx
diff --git a/spec/basic/14_imports.hrx b/spec/non_conformant/basic/14_imports.hrx
similarity index 100%
rename from spec/basic/14_imports.hrx
rename to spec/non_conformant/basic/14_imports.hrx
diff --git a/spec/basic/15_arithmetic_and_lists.hrx b/spec/non_conformant/basic/15_arithmetic_and_lists.hrx
similarity index 100%
rename from spec/basic/15_arithmetic_and_lists.hrx
rename to spec/non_conformant/basic/15_arithmetic_and_lists.hrx
diff --git a/spec/basic/17_basic_mixins.hrx b/spec/non_conformant/basic/17_basic_mixins.hrx
similarity index 100%
rename from spec/basic/17_basic_mixins.hrx
rename to spec/non_conformant/basic/17_basic_mixins.hrx
diff --git a/spec/basic/18_mixin_scope.hrx b/spec/non_conformant/basic/18_mixin_scope.hrx
similarity index 100%
rename from spec/basic/18_mixin_scope.hrx
rename to spec/non_conformant/basic/18_mixin_scope.hrx
diff --git a/spec/basic/19_full_mixin_craziness.hrx b/spec/non_conformant/basic/19_full_mixin_craziness.hrx
similarity index 100%
rename from spec/basic/19_full_mixin_craziness.hrx
rename to spec/non_conformant/basic/19_full_mixin_craziness.hrx
diff --git a/spec/basic/20_scoped_variables.hrx b/spec/non_conformant/basic/20_scoped_variables.hrx
similarity index 100%
rename from spec/basic/20_scoped_variables.hrx
rename to spec/non_conformant/basic/20_scoped_variables.hrx
diff --git a/spec/basic/21_one_builtin_function.hrx b/spec/non_conformant/basic/21_one_builtin_function.hrx
similarity index 100%
rename from spec/basic/21_one_builtin_function.hrx
rename to spec/non_conformant/basic/21_one_builtin_function.hrx
diff --git a/spec/basic/22_colors_with_alpha.hrx b/spec/non_conformant/basic/22_colors_with_alpha.hrx
similarity index 100%
rename from spec/basic/22_colors_with_alpha.hrx
rename to spec/non_conformant/basic/22_colors_with_alpha.hrx
diff --git a/spec/basic/23_basic_value_interpolation.hrx b/spec/non_conformant/basic/23_basic_value_interpolation.hrx
similarity index 100%
rename from spec/basic/23_basic_value_interpolation.hrx
rename to spec/non_conformant/basic/23_basic_value_interpolation.hrx
diff --git a/spec/basic/24_namespace_properties.hrx b/spec/non_conformant/basic/24_namespace_properties.hrx
similarity index 100%
rename from spec/basic/24_namespace_properties.hrx
rename to spec/non_conformant/basic/24_namespace_properties.hrx
diff --git a/spec/basic/25_basic_string_interpolation.hrx b/spec/non_conformant/basic/25_basic_string_interpolation.hrx
similarity index 100%
rename from spec/basic/25_basic_string_interpolation.hrx
rename to spec/non_conformant/basic/25_basic_string_interpolation.hrx
diff --git a/spec/basic/26_selector_interpolation.hrx b/spec/non_conformant/basic/26_selector_interpolation.hrx
similarity index 100%
rename from spec/basic/26_selector_interpolation.hrx
rename to spec/non_conformant/basic/26_selector_interpolation.hrx
diff --git a/spec/basic/27_media_queries.hrx b/spec/non_conformant/basic/27_media_queries.hrx
similarity index 100%
rename from spec/basic/27_media_queries.hrx
rename to spec/non_conformant/basic/27_media_queries.hrx
diff --git a/spec/basic/28_url.hrx b/spec/non_conformant/basic/28_url.hrx
similarity index 100%
rename from spec/basic/28_url.hrx
rename to spec/non_conformant/basic/28_url.hrx
diff --git a/spec/basic/29_if.hrx b/spec/non_conformant/basic/29_if.hrx
similarity index 100%
rename from spec/basic/29_if.hrx
rename to spec/non_conformant/basic/29_if.hrx
diff --git a/spec/basic/30_if_in_function.hrx b/spec/non_conformant/basic/30_if_in_function.hrx
similarity index 100%
rename from spec/basic/30_if_in_function.hrx
rename to spec/non_conformant/basic/30_if_in_function.hrx
diff --git a/spec/basic/31_if_in_mixin.hrx b/spec/non_conformant/basic/31_if_in_mixin.hrx
similarity index 100%
rename from spec/basic/31_if_in_mixin.hrx
rename to spec/non_conformant/basic/31_if_in_mixin.hrx
diff --git a/spec/basic/32_percentages.hrx b/spec/non_conformant/basic/32_percentages.hrx
similarity index 100%
rename from spec/basic/32_percentages.hrx
rename to spec/non_conformant/basic/32_percentages.hrx
diff --git a/spec/basic/33_ambiguous_imports.hrx b/spec/non_conformant/basic/33_ambiguous_imports.hrx
similarity index 100%
rename from spec/basic/33_ambiguous_imports.hrx
rename to spec/non_conformant/basic/33_ambiguous_imports.hrx
diff --git a/spec/basic/35_varargs_false.hrx b/spec/non_conformant/basic/35_varargs_false.hrx
similarity index 100%
rename from spec/basic/35_varargs_false.hrx
rename to spec/non_conformant/basic/35_varargs_false.hrx
diff --git a/spec/basic/36_extra_commas_in_selectors.hrx b/spec/non_conformant/basic/36_extra_commas_in_selectors.hrx
similarity index 100%
rename from spec/basic/36_extra_commas_in_selectors.hrx
rename to spec/non_conformant/basic/36_extra_commas_in_selectors.hrx
diff --git a/spec/basic/37_url_expressions.hrx b/spec/non_conformant/basic/37_url_expressions.hrx
similarity index 100%
rename from spec/basic/37_url_expressions.hrx
rename to spec/non_conformant/basic/37_url_expressions.hrx
diff --git a/spec/basic/38_expressions_in_at_directives.hrx b/spec/non_conformant/basic/38_expressions_in_at_directives.hrx
similarity index 100%
rename from spec/basic/38_expressions_in_at_directives.hrx
rename to spec/non_conformant/basic/38_expressions_in_at_directives.hrx
diff --git a/spec/basic/39_dash_match_attribute_selector.hrx b/spec/non_conformant/basic/39_dash_match_attribute_selector.hrx
similarity index 100%
rename from spec/basic/39_dash_match_attribute_selector.hrx
rename to spec/non_conformant/basic/39_dash_match_attribute_selector.hrx
diff --git a/spec/basic/40_pseudo_class_identifier_starting_with_n.hrx b/spec/non_conformant/basic/40_pseudo_class_identifier_starting_with_n.hrx
similarity index 100%
rename from spec/basic/40_pseudo_class_identifier_starting_with_n.hrx
rename to spec/non_conformant/basic/40_pseudo_class_identifier_starting_with_n.hrx
diff --git a/spec/basic/41_slashy_urls.hrx b/spec/non_conformant/basic/41_slashy_urls.hrx
similarity index 100%
rename from spec/basic/41_slashy_urls.hrx
rename to spec/non_conformant/basic/41_slashy_urls.hrx
diff --git a/spec/basic/42_css_imports.hrx b/spec/non_conformant/basic/42_css_imports.hrx
similarity index 100%
rename from spec/basic/42_css_imports.hrx
rename to spec/non_conformant/basic/42_css_imports.hrx
diff --git a/spec/basic/44_bem_selectors.hrx b/spec/non_conformant/basic/44_bem_selectors.hrx
similarity index 100%
rename from spec/basic/44_bem_selectors.hrx
rename to spec/non_conformant/basic/44_bem_selectors.hrx
diff --git a/spec/basic/49_interpolants_in_css_imports.hrx b/spec/non_conformant/basic/49_interpolants_in_css_imports.hrx
similarity index 100%
rename from spec/basic/49_interpolants_in_css_imports.hrx
rename to spec/non_conformant/basic/49_interpolants_in_css_imports.hrx
diff --git a/spec/basic/50_wrapped_pseudo_selectors.hrx b/spec/non_conformant/basic/50_wrapped_pseudo_selectors.hrx
similarity index 100%
rename from spec/basic/50_wrapped_pseudo_selectors.hrx
rename to spec/non_conformant/basic/50_wrapped_pseudo_selectors.hrx
diff --git a/spec/basic/51_trailing_commas_in_list.hrx b/spec/non_conformant/basic/51_trailing_commas_in_list.hrx
similarity index 100%
rename from spec/basic/51_trailing_commas_in_list.hrx
rename to spec/non_conformant/basic/51_trailing_commas_in_list.hrx
diff --git a/spec/basic/52_interchangeable_hyphens_underscores.hrx b/spec/non_conformant/basic/52_interchangeable_hyphens_underscores.hrx
similarity index 100%
rename from spec/basic/52_interchangeable_hyphens_underscores.hrx
rename to spec/non_conformant/basic/52_interchangeable_hyphens_underscores.hrx
diff --git a/spec/basic/53_escaped_quotes/input.scss b/spec/non_conformant/basic/53_escaped_quotes/input.scss
similarity index 100%
rename from spec/basic/53_escaped_quotes/input.scss
rename to spec/non_conformant/basic/53_escaped_quotes/input.scss
diff --git a/spec/basic/53_escaped_quotes/options.yml b/spec/non_conformant/basic/53_escaped_quotes/options.yml
similarity index 100%
rename from spec/basic/53_escaped_quotes/options.yml
rename to spec/non_conformant/basic/53_escaped_quotes/options.yml
diff --git a/spec/basic/53_escaped_quotes/output-dart-sass.css b/spec/non_conformant/basic/53_escaped_quotes/output-dart-sass.css
similarity index 100%
rename from spec/basic/53_escaped_quotes/output-dart-sass.css
rename to spec/non_conformant/basic/53_escaped_quotes/output-dart-sass.css
diff --git a/spec/basic/53_escaped_quotes/output.css b/spec/non_conformant/basic/53_escaped_quotes/output.css
similarity index 100%
rename from spec/basic/53_escaped_quotes/output.css
rename to spec/non_conformant/basic/53_escaped_quotes/output.css
diff --git a/spec/basic/54_adjacent_identifiers_with_hyphens.hrx b/spec/non_conformant/basic/54_adjacent_identifiers_with_hyphens.hrx
similarity index 100%
rename from spec/basic/54_adjacent_identifiers_with_hyphens.hrx
rename to spec/non_conformant/basic/54_adjacent_identifiers_with_hyphens.hrx
diff --git a/spec/basic/55_variable_exists.hrx b/spec/non_conformant/basic/55_variable_exists.hrx
similarity index 100%
rename from spec/basic/55_variable_exists.hrx
rename to spec/non_conformant/basic/55_variable_exists.hrx
diff --git a/spec/basic/56_global_variable_exists.hrx b/spec/non_conformant/basic/56_global_variable_exists.hrx
similarity index 100%
rename from spec/basic/56_global_variable_exists.hrx
rename to spec/non_conformant/basic/56_global_variable_exists.hrx
diff --git a/spec/basic/57_function_exists.hrx b/spec/non_conformant/basic/57_function_exists.hrx
similarity index 100%
rename from spec/basic/57_function_exists.hrx
rename to spec/non_conformant/basic/57_function_exists.hrx
diff --git a/spec/basic/58_mixin_exists.hrx b/spec/non_conformant/basic/58_mixin_exists.hrx
similarity index 100%
rename from spec/basic/58_mixin_exists.hrx
rename to spec/non_conformant/basic/58_mixin_exists.hrx
diff --git a/spec/basic/59_if_expression.hrx b/spec/non_conformant/basic/59_if_expression.hrx
similarity index 100%
rename from spec/basic/59_if_expression.hrx
rename to spec/non_conformant/basic/59_if_expression.hrx
diff --git a/spec/colors/basic.hrx b/spec/non_conformant/colors/basic.hrx
similarity index 100%
rename from spec/colors/basic.hrx
rename to spec/non_conformant/colors/basic.hrx
diff --git a/spec/colors/change-color.hrx b/spec/non_conformant/colors/change-color.hrx
similarity index 100%
rename from spec/colors/change-color.hrx
rename to spec/non_conformant/colors/change-color.hrx
diff --git a/spec/errors/extend/placeholder/missing.hrx b/spec/non_conformant/errors/extend/placeholder/missing.hrx
similarity index 100%
rename from spec/errors/extend/placeholder/missing.hrx
rename to spec/non_conformant/errors/extend/placeholder/missing.hrx
diff --git a/spec/errors/extend/placeholder/optional.hrx b/spec/non_conformant/errors/extend/placeholder/optional.hrx
similarity index 100%
rename from spec/errors/extend/placeholder/optional.hrx
rename to spec/non_conformant/errors/extend/placeholder/optional.hrx
diff --git a/spec/errors/extend/placeholder/simple.hrx b/spec/non_conformant/errors/extend/placeholder/simple.hrx
similarity index 100%
rename from spec/errors/extend/placeholder/simple.hrx
rename to spec/non_conformant/errors/extend/placeholder/simple.hrx
diff --git a/spec/errors/extend/selector/missing.hrx b/spec/non_conformant/errors/extend/selector/missing.hrx
similarity index 100%
rename from spec/errors/extend/selector/missing.hrx
rename to spec/non_conformant/errors/extend/selector/missing.hrx
diff --git a/spec/errors/extend/selector/optional.hrx b/spec/non_conformant/errors/extend/selector/optional.hrx
similarity index 100%
rename from spec/errors/extend/selector/optional.hrx
rename to spec/non_conformant/errors/extend/selector/optional.hrx
diff --git a/spec/errors/extend/selector/simple.hrx b/spec/non_conformant/errors/extend/selector/simple.hrx
similarity index 100%
rename from spec/errors/extend/selector/simple.hrx
rename to spec/non_conformant/errors/extend/selector/simple.hrx
diff --git a/spec/errors/fn-change-color-1.hrx b/spec/non_conformant/errors/fn-change-color-1.hrx
similarity index 100%
rename from spec/errors/fn-change-color-1.hrx
rename to spec/non_conformant/errors/fn-change-color-1.hrx
diff --git a/spec/errors/fn-debug/property.hrx b/spec/non_conformant/errors/fn-debug/property.hrx
similarity index 100%
rename from spec/errors/fn-debug/property.hrx
rename to spec/non_conformant/errors/fn-debug/property.hrx
diff --git a/spec/errors/fn-debug/ruleset.hrx b/spec/non_conformant/errors/fn-debug/ruleset.hrx
similarity index 100%
rename from spec/errors/fn-debug/ruleset.hrx
rename to spec/non_conformant/errors/fn-debug/ruleset.hrx
diff --git a/spec/errors/fn-debug/simple.hrx b/spec/non_conformant/errors/fn-debug/simple.hrx
similarity index 100%
rename from spec/errors/fn-debug/simple.hrx
rename to spec/non_conformant/errors/fn-debug/simple.hrx
diff --git a/spec/errors/fn-error/property.hrx b/spec/non_conformant/errors/fn-error/property.hrx
similarity index 100%
rename from spec/errors/fn-error/property.hrx
rename to spec/non_conformant/errors/fn-error/property.hrx
diff --git a/spec/errors/fn-error/ruleset.hrx b/spec/non_conformant/errors/fn-error/ruleset.hrx
similarity index 100%
rename from spec/errors/fn-error/ruleset.hrx
rename to spec/non_conformant/errors/fn-error/ruleset.hrx
diff --git a/spec/errors/fn-error/simple.hrx b/spec/non_conformant/errors/fn-error/simple.hrx
similarity index 100%
rename from spec/errors/fn-error/simple.hrx
rename to spec/non_conformant/errors/fn-error/simple.hrx
diff --git a/spec/errors/fn-saturate-out-of-range.hrx b/spec/non_conformant/errors/fn-saturate-out-of-range.hrx
similarity index 100%
rename from spec/errors/fn-saturate-out-of-range.hrx
rename to spec/non_conformant/errors/fn-saturate-out-of-range.hrx
diff --git a/spec/errors/fn-varargs/at-start.hrx b/spec/non_conformant/errors/fn-varargs/at-start.hrx
similarity index 100%
rename from spec/errors/fn-varargs/at-start.hrx
rename to spec/non_conformant/errors/fn-varargs/at-start.hrx
diff --git a/spec/errors/fn-varargs/multiple.hrx b/spec/non_conformant/errors/fn-varargs/multiple.hrx
similarity index 100%
rename from spec/errors/fn-varargs/multiple.hrx
rename to spec/non_conformant/errors/fn-varargs/multiple.hrx
diff --git a/spec/errors/fn-varargs/with-default.hrx b/spec/non_conformant/errors/fn-varargs/with-default.hrx
similarity index 100%
rename from spec/errors/fn-varargs/with-default.hrx
rename to spec/non_conformant/errors/fn-varargs/with-default.hrx
diff --git a/spec/errors/fn-varargs/with-optional.hrx b/spec/non_conformant/errors/fn-varargs/with-optional.hrx
similarity index 100%
rename from spec/errors/fn-varargs/with-optional.hrx
rename to spec/non_conformant/errors/fn-varargs/with-optional.hrx
diff --git a/spec/errors/fn-warn/property.hrx b/spec/non_conformant/errors/fn-warn/property.hrx
similarity index 100%
rename from spec/errors/fn-warn/property.hrx
rename to spec/non_conformant/errors/fn-warn/property.hrx
diff --git a/spec/errors/fn-warn/ruleset.hrx b/spec/non_conformant/errors/fn-warn/ruleset.hrx
similarity index 100%
rename from spec/errors/fn-warn/ruleset.hrx
rename to spec/non_conformant/errors/fn-warn/ruleset.hrx
diff --git a/spec/errors/fn-warn/simple.hrx b/spec/non_conformant/errors/fn-warn/simple.hrx
similarity index 100%
rename from spec/errors/fn-warn/simple.hrx
rename to spec/non_conformant/errors/fn-warn/simple.hrx
diff --git a/spec/errors/for-incompatible-units-fn.hrx b/spec/non_conformant/errors/for-incompatible-units-fn.hrx
similarity index 100%
rename from spec/errors/for-incompatible-units-fn.hrx
rename to spec/non_conformant/errors/for-incompatible-units-fn.hrx
diff --git a/spec/errors/for-incompatible-units.hrx b/spec/non_conformant/errors/for-incompatible-units.hrx
similarity index 100%
rename from spec/errors/for-incompatible-units.hrx
rename to spec/non_conformant/errors/for-incompatible-units.hrx
diff --git a/spec/errors/import/file/control-else.hrx b/spec/non_conformant/errors/import/file/control-else.hrx
similarity index 100%
rename from spec/errors/import/file/control-else.hrx
rename to spec/non_conformant/errors/import/file/control-else.hrx
diff --git a/spec/errors/import/file/control-if.hrx b/spec/non_conformant/errors/import/file/control-if.hrx
similarity index 100%
rename from spec/errors/import/file/control-if.hrx
rename to spec/non_conformant/errors/import/file/control-if.hrx
diff --git a/spec/errors/import/file/loop/each.hrx b/spec/non_conformant/errors/import/file/loop/each.hrx
similarity index 100%
rename from spec/errors/import/file/loop/each.hrx
rename to spec/non_conformant/errors/import/file/loop/each.hrx
diff --git a/spec/errors/import/file/loop/for.hrx b/spec/non_conformant/errors/import/file/loop/for.hrx
similarity index 100%
rename from spec/errors/import/file/loop/for.hrx
rename to spec/non_conformant/errors/import/file/loop/for.hrx
diff --git a/spec/errors/import/file/loop/while.hrx b/spec/non_conformant/errors/import/file/loop/while.hrx
similarity index 100%
rename from spec/errors/import/file/loop/while.hrx
rename to spec/non_conformant/errors/import/file/loop/while.hrx
diff --git a/spec/errors/import/file/mixin/control-else/inside.hrx b/spec/non_conformant/errors/import/file/mixin/control-else/inside.hrx
similarity index 100%
rename from spec/errors/import/file/mixin/control-else/inside.hrx
rename to spec/non_conformant/errors/import/file/mixin/control-else/inside.hrx
diff --git a/spec/errors/import/file/mixin/control-else/outside.hrx b/spec/non_conformant/errors/import/file/mixin/control-else/outside.hrx
similarity index 100%
rename from spec/errors/import/file/mixin/control-else/outside.hrx
rename to spec/non_conformant/errors/import/file/mixin/control-else/outside.hrx
diff --git a/spec/errors/import/file/mixin/control-if/inside.hrx b/spec/non_conformant/errors/import/file/mixin/control-if/inside.hrx
similarity index 100%
rename from spec/errors/import/file/mixin/control-if/inside.hrx
rename to spec/non_conformant/errors/import/file/mixin/control-if/inside.hrx
diff --git a/spec/errors/import/file/mixin/control-if/outside.hrx b/spec/non_conformant/errors/import/file/mixin/control-if/outside.hrx
similarity index 100%
rename from spec/errors/import/file/mixin/control-if/outside.hrx
rename to spec/non_conformant/errors/import/file/mixin/control-if/outside.hrx
diff --git a/spec/errors/import/file/mixin/simple/inside.hrx b/spec/non_conformant/errors/import/file/mixin/simple/inside.hrx
similarity index 100%
rename from spec/errors/import/file/mixin/simple/inside.hrx
rename to spec/non_conformant/errors/import/file/mixin/simple/inside.hrx
diff --git a/spec/errors/import/file/mixin/simple/outside.hrx b/spec/non_conformant/errors/import/file/mixin/simple/outside.hrx
similarity index 100%
rename from spec/errors/import/file/mixin/simple/outside.hrx
rename to spec/non_conformant/errors/import/file/mixin/simple/outside.hrx
diff --git a/spec/errors/import/file/simple.hrx b/spec/non_conformant/errors/import/file/simple.hrx
similarity index 100%
rename from spec/errors/import/file/simple.hrx
rename to spec/non_conformant/errors/import/file/simple.hrx
diff --git a/spec/errors/import/miss/control-else.hrx b/spec/non_conformant/errors/import/miss/control-else.hrx
similarity index 100%
rename from spec/errors/import/miss/control-else.hrx
rename to spec/non_conformant/errors/import/miss/control-else.hrx
diff --git a/spec/errors/import/miss/control-if.hrx b/spec/non_conformant/errors/import/miss/control-if.hrx
similarity index 100%
rename from spec/errors/import/miss/control-if.hrx
rename to spec/non_conformant/errors/import/miss/control-if.hrx
diff --git a/spec/errors/import/miss/loop/each.hrx b/spec/non_conformant/errors/import/miss/loop/each.hrx
similarity index 100%
rename from spec/errors/import/miss/loop/each.hrx
rename to spec/non_conformant/errors/import/miss/loop/each.hrx
diff --git a/spec/errors/import/miss/loop/for.hrx b/spec/non_conformant/errors/import/miss/loop/for.hrx
similarity index 100%
rename from spec/errors/import/miss/loop/for.hrx
rename to spec/non_conformant/errors/import/miss/loop/for.hrx
diff --git a/spec/errors/import/miss/loop/while.hrx b/spec/non_conformant/errors/import/miss/loop/while.hrx
similarity index 100%
rename from spec/errors/import/miss/loop/while.hrx
rename to spec/non_conformant/errors/import/miss/loop/while.hrx
diff --git a/spec/errors/import/miss/mixin/control-else/inside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-else/inside.hrx
similarity index 100%
rename from spec/errors/import/miss/mixin/control-else/inside.hrx
rename to spec/non_conformant/errors/import/miss/mixin/control-else/inside.hrx
diff --git a/spec/errors/import/miss/mixin/control-else/outside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-else/outside.hrx
similarity index 100%
rename from spec/errors/import/miss/mixin/control-else/outside.hrx
rename to spec/non_conformant/errors/import/miss/mixin/control-else/outside.hrx
diff --git a/spec/errors/import/miss/mixin/control-if/inside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-if/inside.hrx
similarity index 100%
rename from spec/errors/import/miss/mixin/control-if/inside.hrx
rename to spec/non_conformant/errors/import/miss/mixin/control-if/inside.hrx
diff --git a/spec/errors/import/miss/mixin/control-if/outside.hrx b/spec/non_conformant/errors/import/miss/mixin/control-if/outside.hrx
similarity index 100%
rename from spec/errors/import/miss/mixin/control-if/outside.hrx
rename to spec/non_conformant/errors/import/miss/mixin/control-if/outside.hrx
diff --git a/spec/errors/import/miss/mixin/simple/inside.hrx b/spec/non_conformant/errors/import/miss/mixin/simple/inside.hrx
similarity index 100%
rename from spec/errors/import/miss/mixin/simple/inside.hrx
rename to spec/non_conformant/errors/import/miss/mixin/simple/inside.hrx
diff --git a/spec/errors/import/miss/mixin/simple/outside.hrx b/spec/non_conformant/errors/import/miss/mixin/simple/outside.hrx
similarity index 100%
rename from spec/errors/import/miss/mixin/simple/outside.hrx
rename to spec/non_conformant/errors/import/miss/mixin/simple/outside.hrx
diff --git a/spec/errors/import/miss/simple.hrx b/spec/non_conformant/errors/import/miss/simple.hrx
similarity index 100%
rename from spec/errors/import/miss/simple.hrx
rename to spec/non_conformant/errors/import/miss/simple.hrx
diff --git a/spec/errors/import/url/control-else.hrx b/spec/non_conformant/errors/import/url/control-else.hrx
similarity index 100%
rename from spec/errors/import/url/control-else.hrx
rename to spec/non_conformant/errors/import/url/control-else.hrx
diff --git a/spec/errors/import/url/control-if.hrx b/spec/non_conformant/errors/import/url/control-if.hrx
similarity index 100%
rename from spec/errors/import/url/control-if.hrx
rename to spec/non_conformant/errors/import/url/control-if.hrx
diff --git a/spec/errors/import/url/loop/each.hrx b/spec/non_conformant/errors/import/url/loop/each.hrx
similarity index 100%
rename from spec/errors/import/url/loop/each.hrx
rename to spec/non_conformant/errors/import/url/loop/each.hrx
diff --git a/spec/errors/import/url/loop/for.hrx b/spec/non_conformant/errors/import/url/loop/for.hrx
similarity index 100%
rename from spec/errors/import/url/loop/for.hrx
rename to spec/non_conformant/errors/import/url/loop/for.hrx
diff --git a/spec/errors/import/url/loop/while.hrx b/spec/non_conformant/errors/import/url/loop/while.hrx
similarity index 100%
rename from spec/errors/import/url/loop/while.hrx
rename to spec/non_conformant/errors/import/url/loop/while.hrx
diff --git a/spec/errors/import/url/mixin/control-else/outside.hrx b/spec/non_conformant/errors/import/url/mixin/control-else/outside.hrx
similarity index 100%
rename from spec/errors/import/url/mixin/control-else/outside.hrx
rename to spec/non_conformant/errors/import/url/mixin/control-else/outside.hrx
diff --git a/spec/errors/import/url/mixin/control-if/outside.hrx b/spec/non_conformant/errors/import/url/mixin/control-if/outside.hrx
similarity index 100%
rename from spec/errors/import/url/mixin/control-if/outside.hrx
rename to spec/non_conformant/errors/import/url/mixin/control-if/outside.hrx
diff --git a/spec/errors/import/url/mixin/simple/inside.hrx b/spec/non_conformant/errors/import/url/mixin/simple/inside.hrx
similarity index 100%
rename from spec/errors/import/url/mixin/simple/inside.hrx
rename to spec/non_conformant/errors/import/url/mixin/simple/inside.hrx
diff --git a/spec/errors/import/url/mixin/simple/outside.hrx b/spec/non_conformant/errors/import/url/mixin/simple/outside.hrx
similarity index 100%
rename from spec/errors/import/url/mixin/simple/outside.hrx
rename to spec/non_conformant/errors/import/url/mixin/simple/outside.hrx
diff --git a/spec/errors/import/url/simple.hrx b/spec/non_conformant/errors/import/url/simple.hrx
similarity index 100%
rename from spec/errors/import/url/simple.hrx
rename to spec/non_conformant/errors/import/url/simple.hrx
diff --git a/spec/errors/interpolation/error-1.hrx b/spec/non_conformant/errors/interpolation/error-1.hrx
similarity index 100%
rename from spec/errors/interpolation/error-1.hrx
rename to spec/non_conformant/errors/interpolation/error-1.hrx
diff --git a/spec/errors/invalid-operation/gt.hrx b/spec/non_conformant/errors/invalid-operation/gt.hrx
similarity index 100%
rename from spec/errors/invalid-operation/gt.hrx
rename to spec/non_conformant/errors/invalid-operation/gt.hrx
diff --git a/spec/errors/invalid-operation/gte.hrx b/spec/non_conformant/errors/invalid-operation/gte.hrx
similarity index 100%
rename from spec/errors/invalid-operation/gte.hrx
rename to spec/non_conformant/errors/invalid-operation/gte.hrx
diff --git a/spec/errors/invalid-operation/lt.hrx b/spec/non_conformant/errors/invalid-operation/lt.hrx
similarity index 100%
rename from spec/errors/invalid-operation/lt.hrx
rename to spec/non_conformant/errors/invalid-operation/lt.hrx
diff --git a/spec/errors/invalid-operation/lte.hrx b/spec/non_conformant/errors/invalid-operation/lte.hrx
similarity index 100%
rename from spec/errors/invalid-operation/lte.hrx
rename to spec/non_conformant/errors/invalid-operation/lte.hrx
diff --git a/spec/errors/invalid-operation/mod.hrx b/spec/non_conformant/errors/invalid-operation/mod.hrx
similarity index 100%
rename from spec/errors/invalid-operation/mod.hrx
rename to spec/non_conformant/errors/invalid-operation/mod.hrx
diff --git a/spec/errors/invalid-operation/plus.hrx b/spec/non_conformant/errors/invalid-operation/plus.hrx
similarity index 100%
rename from spec/errors/invalid-operation/plus.hrx
rename to spec/non_conformant/errors/invalid-operation/plus.hrx
diff --git a/spec/errors/invalid-operation/sub.hrx b/spec/non_conformant/errors/invalid-operation/sub.hrx
similarity index 100%
rename from spec/errors/invalid-operation/sub.hrx
rename to spec/non_conformant/errors/invalid-operation/sub.hrx
diff --git a/spec/errors/invalid-operation/times.hrx b/spec/non_conformant/errors/invalid-operation/times.hrx
similarity index 100%
rename from spec/errors/invalid-operation/times.hrx
rename to spec/non_conformant/errors/invalid-operation/times.hrx
diff --git a/spec/errors/invalid-parent/function-in-each.hrx b/spec/non_conformant/errors/invalid-parent/function-in-each.hrx
similarity index 100%
rename from spec/errors/invalid-parent/function-in-each.hrx
rename to spec/non_conformant/errors/invalid-parent/function-in-each.hrx
diff --git a/spec/errors/invalid-parent/function-in-for.hrx b/spec/non_conformant/errors/invalid-parent/function-in-for.hrx
similarity index 100%
rename from spec/errors/invalid-parent/function-in-for.hrx
rename to spec/non_conformant/errors/invalid-parent/function-in-for.hrx
diff --git a/spec/errors/invalid-parent/function-in-function.hrx b/spec/non_conformant/errors/invalid-parent/function-in-function.hrx
similarity index 100%
rename from spec/errors/invalid-parent/function-in-function.hrx
rename to spec/non_conformant/errors/invalid-parent/function-in-function.hrx
diff --git a/spec/errors/invalid-parent/function-in-if.hrx b/spec/non_conformant/errors/invalid-parent/function-in-if.hrx
similarity index 100%
rename from spec/errors/invalid-parent/function-in-if.hrx
rename to spec/non_conformant/errors/invalid-parent/function-in-if.hrx
diff --git a/spec/errors/invalid-parent/function-in-mixin.hrx b/spec/non_conformant/errors/invalid-parent/function-in-mixin.hrx
similarity index 100%
rename from spec/errors/invalid-parent/function-in-mixin.hrx
rename to spec/non_conformant/errors/invalid-parent/function-in-mixin.hrx
diff --git a/spec/errors/invalid-parent/function-in-while.hrx b/spec/non_conformant/errors/invalid-parent/function-in-while.hrx
similarity index 100%
rename from spec/errors/invalid-parent/function-in-while.hrx
rename to spec/non_conformant/errors/invalid-parent/function-in-while.hrx
diff --git a/spec/errors/invalid-parent/mixin-in-each.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-each.hrx
similarity index 100%
rename from spec/errors/invalid-parent/mixin-in-each.hrx
rename to spec/non_conformant/errors/invalid-parent/mixin-in-each.hrx
diff --git a/spec/errors/invalid-parent/mixin-in-for.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-for.hrx
similarity index 100%
rename from spec/errors/invalid-parent/mixin-in-for.hrx
rename to spec/non_conformant/errors/invalid-parent/mixin-in-for.hrx
diff --git a/spec/errors/invalid-parent/mixin-in-function.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-function.hrx
similarity index 100%
rename from spec/errors/invalid-parent/mixin-in-function.hrx
rename to spec/non_conformant/errors/invalid-parent/mixin-in-function.hrx
diff --git a/spec/errors/invalid-parent/mixin-in-if.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-if.hrx
similarity index 100%
rename from spec/errors/invalid-parent/mixin-in-if.hrx
rename to spec/non_conformant/errors/invalid-parent/mixin-in-if.hrx
diff --git a/spec/errors/invalid-parent/mixin-in-mixin.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-mixin.hrx
similarity index 100%
rename from spec/errors/invalid-parent/mixin-in-mixin.hrx
rename to spec/non_conformant/errors/invalid-parent/mixin-in-mixin.hrx
diff --git a/spec/errors/invalid-parent/mixin-in-while.hrx b/spec/non_conformant/errors/invalid-parent/mixin-in-while.hrx
similarity index 100%
rename from spec/errors/invalid-parent/mixin-in-while.hrx
rename to spec/non_conformant/errors/invalid-parent/mixin-in-while.hrx
diff --git a/spec/errors/invalid-parent/return-in-mixin.hrx b/spec/non_conformant/errors/invalid-parent/return-in-mixin.hrx
similarity index 100%
rename from spec/errors/invalid-parent/return-in-mixin.hrx
rename to spec/non_conformant/errors/invalid-parent/return-in-mixin.hrx
diff --git a/spec/errors/invalid-parent/return-in-root.hrx b/spec/non_conformant/errors/invalid-parent/return-in-root.hrx
similarity index 100%
rename from spec/errors/invalid-parent/return-in-root.hrx
rename to spec/non_conformant/errors/invalid-parent/return-in-root.hrx
diff --git a/spec/errors/invalid-parent/return-in-ruleset.hrx b/spec/non_conformant/errors/invalid-parent/return-in-ruleset.hrx
similarity index 100%
rename from spec/errors/invalid-parent/return-in-ruleset.hrx
rename to spec/non_conformant/errors/invalid-parent/return-in-ruleset.hrx
diff --git a/spec/errors/loop-for/numeric/lower_eval.hrx b/spec/non_conformant/errors/loop-for/numeric/lower_eval.hrx
similarity index 100%
rename from spec/errors/loop-for/numeric/lower_eval.hrx
rename to spec/non_conformant/errors/loop-for/numeric/lower_eval.hrx
diff --git a/spec/errors/loop-for/numeric/lower_expand.hrx b/spec/non_conformant/errors/loop-for/numeric/lower_expand.hrx
similarity index 100%
rename from spec/errors/loop-for/numeric/lower_expand.hrx
rename to spec/non_conformant/errors/loop-for/numeric/lower_expand.hrx
diff --git a/spec/errors/loop-for/numeric/upper_eval.hrx b/spec/non_conformant/errors/loop-for/numeric/upper_eval.hrx
similarity index 100%
rename from spec/errors/loop-for/numeric/upper_eval.hrx
rename to spec/non_conformant/errors/loop-for/numeric/upper_eval.hrx
diff --git a/spec/errors/loop-for/numeric/upper_expand.hrx b/spec/non_conformant/errors/loop-for/numeric/upper_expand.hrx
similarity index 100%
rename from spec/errors/loop-for/numeric/upper_expand.hrx
rename to spec/non_conformant/errors/loop-for/numeric/upper_expand.hrx
diff --git a/spec/errors/unicode/report/after/error b/spec/non_conformant/errors/unicode/report/after/error
similarity index 100%
rename from spec/errors/unicode/report/after/error
rename to spec/non_conformant/errors/unicode/report/after/error
diff --git a/spec/errors/unicode/report/after/error-dart-sass b/spec/non_conformant/errors/unicode/report/after/error-dart-sass
similarity index 100%
rename from spec/errors/unicode/report/after/error-dart-sass
rename to spec/non_conformant/errors/unicode/report/after/error-dart-sass
diff --git a/spec/errors/unicode/report/after/input.scss b/spec/non_conformant/errors/unicode/report/after/input.scss
similarity index 100%
rename from spec/errors/unicode/report/after/input.scss
rename to spec/non_conformant/errors/unicode/report/after/input.scss
diff --git a/spec/errors/unicode/report/before/error b/spec/non_conformant/errors/unicode/report/before/error
similarity index 100%
rename from spec/errors/unicode/report/before/error
rename to spec/non_conformant/errors/unicode/report/before/error
diff --git a/spec/errors/unicode/report/before/error-dart-sass b/spec/non_conformant/errors/unicode/report/before/error-dart-sass
similarity index 100%
rename from spec/errors/unicode/report/before/error-dart-sass
rename to spec/non_conformant/errors/unicode/report/before/error-dart-sass
diff --git a/spec/errors/unicode/report/before/input.scss b/spec/non_conformant/errors/unicode/report/before/input.scss
similarity index 100%
rename from spec/errors/unicode/report/before/input.scss
rename to spec/non_conformant/errors/unicode/report/before/input.scss
diff --git a/spec/extend-tests/001_test_basic.hrx b/spec/non_conformant/extend-tests/001_test_basic.hrx
similarity index 100%
rename from spec/extend-tests/001_test_basic.hrx
rename to spec/non_conformant/extend-tests/001_test_basic.hrx
diff --git a/spec/extend-tests/002_test_basic.hrx b/spec/non_conformant/extend-tests/002_test_basic.hrx
similarity index 100%
rename from spec/extend-tests/002_test_basic.hrx
rename to spec/non_conformant/extend-tests/002_test_basic.hrx
diff --git a/spec/extend-tests/003_test_basic.hrx b/spec/non_conformant/extend-tests/003_test_basic.hrx
similarity index 100%
rename from spec/extend-tests/003_test_basic.hrx
rename to spec/non_conformant/extend-tests/003_test_basic.hrx
diff --git a/spec/extend-tests/004_test_basic.hrx b/spec/non_conformant/extend-tests/004_test_basic.hrx
similarity index 100%
rename from spec/extend-tests/004_test_basic.hrx
rename to spec/non_conformant/extend-tests/004_test_basic.hrx
diff --git a/spec/extend-tests/005_test_multiple_targets.hrx b/spec/non_conformant/extend-tests/005_test_multiple_targets.hrx
similarity index 100%
rename from spec/extend-tests/005_test_multiple_targets.hrx
rename to spec/non_conformant/extend-tests/005_test_multiple_targets.hrx
diff --git a/spec/extend-tests/006_test_multiple_extendees.hrx b/spec/non_conformant/extend-tests/006_test_multiple_extendees.hrx
similarity index 100%
rename from spec/extend-tests/006_test_multiple_extendees.hrx
rename to spec/non_conformant/extend-tests/006_test_multiple_extendees.hrx
diff --git a/spec/extend-tests/007_test_multiple_extends_with_single_extender_and_single_target.hrx b/spec/non_conformant/extend-tests/007_test_multiple_extends_with_single_extender_and_single_target.hrx
similarity index 100%
rename from spec/extend-tests/007_test_multiple_extends_with_single_extender_and_single_target.hrx
rename to spec/non_conformant/extend-tests/007_test_multiple_extends_with_single_extender_and_single_target.hrx
diff --git a/spec/extend-tests/008_test_multiple_extends_with_single_extender_and_single_target.hrx b/spec/non_conformant/extend-tests/008_test_multiple_extends_with_single_extender_and_single_target.hrx
similarity index 100%
rename from spec/extend-tests/008_test_multiple_extends_with_single_extender_and_single_target.hrx
rename to spec/non_conformant/extend-tests/008_test_multiple_extends_with_single_extender_and_single_target.hrx
diff --git a/spec/extend-tests/009_test_multiple_extends_with_multiple_extenders_and_single_target.hrx b/spec/non_conformant/extend-tests/009_test_multiple_extends_with_multiple_extenders_and_single_target.hrx
similarity index 100%
rename from spec/extend-tests/009_test_multiple_extends_with_multiple_extenders_and_single_target.hrx
rename to spec/non_conformant/extend-tests/009_test_multiple_extends_with_multiple_extenders_and_single_target.hrx
diff --git a/spec/extend-tests/010_test_multiple_extends_with_multiple_extenders_and_single_target.hrx b/spec/non_conformant/extend-tests/010_test_multiple_extends_with_multiple_extenders_and_single_target.hrx
similarity index 100%
rename from spec/extend-tests/010_test_multiple_extends_with_multiple_extenders_and_single_target.hrx
rename to spec/non_conformant/extend-tests/010_test_multiple_extends_with_multiple_extenders_and_single_target.hrx
diff --git a/spec/extend-tests/011_test_chained_extends.hrx b/spec/non_conformant/extend-tests/011_test_chained_extends.hrx
similarity index 100%
rename from spec/extend-tests/011_test_chained_extends.hrx
rename to spec/non_conformant/extend-tests/011_test_chained_extends.hrx
diff --git a/spec/extend-tests/012_test_dynamic_extendee.hrx b/spec/non_conformant/extend-tests/012_test_dynamic_extendee.hrx
similarity index 100%
rename from spec/extend-tests/012_test_dynamic_extendee.hrx
rename to spec/non_conformant/extend-tests/012_test_dynamic_extendee.hrx
diff --git a/spec/extend-tests/013_test_dynamic_extendee.hrx b/spec/non_conformant/extend-tests/013_test_dynamic_extendee.hrx
similarity index 100%
rename from spec/extend-tests/013_test_dynamic_extendee.hrx
rename to spec/non_conformant/extend-tests/013_test_dynamic_extendee.hrx
diff --git a/spec/extend-tests/014_test_nested_target.hrx b/spec/non_conformant/extend-tests/014_test_nested_target.hrx
similarity index 100%
rename from spec/extend-tests/014_test_nested_target.hrx
rename to spec/non_conformant/extend-tests/014_test_nested_target.hrx
diff --git a/spec/extend-tests/015_test_target_with_child.hrx b/spec/non_conformant/extend-tests/015_test_target_with_child.hrx
similarity index 100%
rename from spec/extend-tests/015_test_target_with_child.hrx
rename to spec/non_conformant/extend-tests/015_test_target_with_child.hrx
diff --git a/spec/extend-tests/016_test_class_unification.hrx b/spec/non_conformant/extend-tests/016_test_class_unification.hrx
similarity index 100%
rename from spec/extend-tests/016_test_class_unification.hrx
rename to spec/non_conformant/extend-tests/016_test_class_unification.hrx
diff --git a/spec/extend-tests/017_test_class_unification.hrx b/spec/non_conformant/extend-tests/017_test_class_unification.hrx
similarity index 100%
rename from spec/extend-tests/017_test_class_unification.hrx
rename to spec/non_conformant/extend-tests/017_test_class_unification.hrx
diff --git a/spec/extend-tests/018_test_id_unification.hrx b/spec/non_conformant/extend-tests/018_test_id_unification.hrx
similarity index 100%
rename from spec/extend-tests/018_test_id_unification.hrx
rename to spec/non_conformant/extend-tests/018_test_id_unification.hrx
diff --git a/spec/extend-tests/019_test_id_unification.hrx b/spec/non_conformant/extend-tests/019_test_id_unification.hrx
similarity index 100%
rename from spec/extend-tests/019_test_id_unification.hrx
rename to spec/non_conformant/extend-tests/019_test_id_unification.hrx
diff --git a/spec/extend-tests/020_test_universal_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/020_test_universal_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/020_test_universal_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/020_test_universal_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/021_test_universal_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/021_test_universal_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/021_test_universal_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/021_test_universal_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/022_test_universal_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/022_test_universal_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/022_test_universal_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/022_test_universal_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/023_test_universal_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/023_test_universal_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/023_test_universal_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/023_test_universal_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/024_test_universal_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/024_test_universal_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/024_test_universal_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/024_test_universal_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/025_test_universal_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/025_test_universal_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/025_test_universal_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/025_test_universal_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/026_test_universal_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/026_test_universal_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/027_test_universal_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/027_test_universal_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/027_test_universal_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/027_test_universal_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/028_test_universal_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/028_test_universal_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/029_test_universal_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/029_test_universal_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/029_test_universal_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/029_test_universal_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/030_test_universal_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/030_test_universal_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/030_test_universal_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/030_test_universal_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target.hrx b/spec/non_conformant/extend-tests/031_test_universal_unification_with_namespaced_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target.hrx
rename to spec/non_conformant/extend-tests/031_test_universal_unification_with_namespaced_universal_target.hrx
diff --git a/spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target.hrx b/spec/non_conformant/extend-tests/032_test_universal_unification_with_namespaced_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target.hrx
rename to spec/non_conformant/extend-tests/032_test_universal_unification_with_namespaced_universal_target.hrx
diff --git a/spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target.hrx b/spec/non_conformant/extend-tests/033_test_universal_unification_with_namespaced_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target.hrx
rename to spec/non_conformant/extend-tests/033_test_universal_unification_with_namespaced_universal_target.hrx
diff --git a/spec/extend-tests/034_test_universal_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/034_test_universal_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/034_test_universal_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/034_test_universal_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/035_test_universal_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/035_test_universal_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/036_test_universal_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/036_test_universal_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/036_test_universal_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/036_test_universal_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/037_test_universal_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/037_test_universal_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/038_test_universal_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/038_test_universal_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/038_test_universal_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/038_test_universal_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/039_test_universal_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/039_test_universal_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/039_test_universal_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/039_test_universal_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/040_test_universal_unification_with_namespaced_element_target.hrx b/spec/non_conformant/extend-tests/040_test_universal_unification_with_namespaced_element_target.hrx
similarity index 100%
rename from spec/extend-tests/040_test_universal_unification_with_namespaced_element_target.hrx
rename to spec/non_conformant/extend-tests/040_test_universal_unification_with_namespaced_element_target.hrx
diff --git a/spec/extend-tests/041_test_universal_unification_with_namespaced_element_target.hrx b/spec/non_conformant/extend-tests/041_test_universal_unification_with_namespaced_element_target.hrx
similarity index 100%
rename from spec/extend-tests/041_test_universal_unification_with_namespaced_element_target.hrx
rename to spec/non_conformant/extend-tests/041_test_universal_unification_with_namespaced_element_target.hrx
diff --git a/spec/extend-tests/042_test_universal_unification_with_namespaced_element_target.hrx b/spec/non_conformant/extend-tests/042_test_universal_unification_with_namespaced_element_target.hrx
similarity index 100%
rename from spec/extend-tests/042_test_universal_unification_with_namespaced_element_target.hrx
rename to spec/non_conformant/extend-tests/042_test_universal_unification_with_namespaced_element_target.hrx
diff --git a/spec/extend-tests/043_test_element_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/043_test_element_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/043_test_element_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/043_test_element_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/044_test_element_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/044_test_element_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/044_test_element_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/044_test_element_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/045_test_element_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/045_test_element_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/045_test_element_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/045_test_element_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/046_test_element_unification_with_simple_target.hrx b/spec/non_conformant/extend-tests/046_test_element_unification_with_simple_target.hrx
similarity index 100%
rename from spec/extend-tests/046_test_element_unification_with_simple_target.hrx
rename to spec/non_conformant/extend-tests/046_test_element_unification_with_simple_target.hrx
diff --git a/spec/extend-tests/047_test_element_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/047_test_element_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/047_test_element_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/047_test_element_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/048_test_element_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/048_test_element_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/048_test_element_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/048_test_element_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/049_test_element_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/049_test_element_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/050_test_element_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/050_test_element_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/051_test_element_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/051_test_element_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/051_test_element_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/051_test_element_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target.hrx b/spec/non_conformant/extend-tests/052_test_element_unification_with_namespaceless_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target.hrx
rename to spec/non_conformant/extend-tests/052_test_element_unification_with_namespaceless_universal_target.hrx
diff --git a/spec/extend-tests/053_test_element_unification_with_namespaced_universal_target.hrx b/spec/non_conformant/extend-tests/053_test_element_unification_with_namespaced_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/053_test_element_unification_with_namespaced_universal_target.hrx
rename to spec/non_conformant/extend-tests/053_test_element_unification_with_namespaced_universal_target.hrx
diff --git a/spec/extend-tests/054_test_element_unification_with_namespaced_universal_target.hrx b/spec/non_conformant/extend-tests/054_test_element_unification_with_namespaced_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/054_test_element_unification_with_namespaced_universal_target.hrx
rename to spec/non_conformant/extend-tests/054_test_element_unification_with_namespaced_universal_target.hrx
diff --git a/spec/extend-tests/055_test_element_unification_with_namespaced_universal_target.hrx b/spec/non_conformant/extend-tests/055_test_element_unification_with_namespaced_universal_target.hrx
similarity index 100%
rename from spec/extend-tests/055_test_element_unification_with_namespaced_universal_target.hrx
rename to spec/non_conformant/extend-tests/055_test_element_unification_with_namespaced_universal_target.hrx
diff --git a/spec/extend-tests/056_test_element_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/056_test_element_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/056_test_element_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/056_test_element_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/057_test_element_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/057_test_element_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/057_test_element_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/057_test_element_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/058_test_element_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/058_test_element_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/058_test_element_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/058_test_element_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/059_test_element_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/059_test_element_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/059_test_element_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/059_test_element_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/060_test_element_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/060_test_element_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/060_test_element_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/060_test_element_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/061_test_element_unification_with_namespaceless_element_target.hrx b/spec/non_conformant/extend-tests/061_test_element_unification_with_namespaceless_element_target.hrx
similarity index 100%
rename from spec/extend-tests/061_test_element_unification_with_namespaceless_element_target.hrx
rename to spec/non_conformant/extend-tests/061_test_element_unification_with_namespaceless_element_target.hrx
diff --git a/spec/extend-tests/062_test_element_unification_with_namespaced_element_target.hrx b/spec/non_conformant/extend-tests/062_test_element_unification_with_namespaced_element_target.hrx
similarity index 100%
rename from spec/extend-tests/062_test_element_unification_with_namespaced_element_target.hrx
rename to spec/non_conformant/extend-tests/062_test_element_unification_with_namespaced_element_target.hrx
diff --git a/spec/extend-tests/063_test_element_unification_with_namespaced_element_target.hrx b/spec/non_conformant/extend-tests/063_test_element_unification_with_namespaced_element_target.hrx
similarity index 100%
rename from spec/extend-tests/063_test_element_unification_with_namespaced_element_target.hrx
rename to spec/non_conformant/extend-tests/063_test_element_unification_with_namespaced_element_target.hrx
diff --git a/spec/extend-tests/064_test_element_unification_with_namespaced_element_target.hrx b/spec/non_conformant/extend-tests/064_test_element_unification_with_namespaced_element_target.hrx
similarity index 100%
rename from spec/extend-tests/064_test_element_unification_with_namespaced_element_target.hrx
rename to spec/non_conformant/extend-tests/064_test_element_unification_with_namespaced_element_target.hrx
diff --git a/spec/extend-tests/065_test_attribute_unification.hrx b/spec/non_conformant/extend-tests/065_test_attribute_unification.hrx
similarity index 100%
rename from spec/extend-tests/065_test_attribute_unification.hrx
rename to spec/non_conformant/extend-tests/065_test_attribute_unification.hrx
diff --git a/spec/extend-tests/066_test_attribute_unification.hrx b/spec/non_conformant/extend-tests/066_test_attribute_unification.hrx
similarity index 100%
rename from spec/extend-tests/066_test_attribute_unification.hrx
rename to spec/non_conformant/extend-tests/066_test_attribute_unification.hrx
diff --git a/spec/extend-tests/067_test_attribute_unification.hrx b/spec/non_conformant/extend-tests/067_test_attribute_unification.hrx
similarity index 100%
rename from spec/extend-tests/067_test_attribute_unification.hrx
rename to spec/non_conformant/extend-tests/067_test_attribute_unification.hrx
diff --git a/spec/extend-tests/068_test_attribute_unification.hrx b/spec/non_conformant/extend-tests/068_test_attribute_unification.hrx
similarity index 100%
rename from spec/extend-tests/068_test_attribute_unification.hrx
rename to spec/non_conformant/extend-tests/068_test_attribute_unification.hrx
diff --git a/spec/extend-tests/069_test_attribute_unification.hrx b/spec/non_conformant/extend-tests/069_test_attribute_unification.hrx
similarity index 100%
rename from spec/extend-tests/069_test_attribute_unification.hrx
rename to spec/non_conformant/extend-tests/069_test_attribute_unification.hrx
diff --git a/spec/extend-tests/070_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/070_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/070_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/070_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/071_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/071_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/071_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/071_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/072_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/072_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/072_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/072_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/073_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/073_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/073_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/073_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/074_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/074_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/074_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/074_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/075_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/075_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/075_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/075_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/076_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/076_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/076_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/076_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/077_test_pseudo_unification.hrx b/spec/non_conformant/extend-tests/077_test_pseudo_unification.hrx
similarity index 100%
rename from spec/extend-tests/077_test_pseudo_unification.hrx
rename to spec/non_conformant/extend-tests/077_test_pseudo_unification.hrx
diff --git a/spec/extend-tests/078_test_pseudoelement_remains_at_end_of_selector.hrx b/spec/non_conformant/extend-tests/078_test_pseudoelement_remains_at_end_of_selector.hrx
similarity index 100%
rename from spec/extend-tests/078_test_pseudoelement_remains_at_end_of_selector.hrx
rename to spec/non_conformant/extend-tests/078_test_pseudoelement_remains_at_end_of_selector.hrx
diff --git a/spec/extend-tests/079_test_pseudoelement_remains_at_end_of_selector.hrx b/spec/non_conformant/extend-tests/079_test_pseudoelement_remains_at_end_of_selector.hrx
similarity index 100%
rename from spec/extend-tests/079_test_pseudoelement_remains_at_end_of_selector.hrx
rename to spec/non_conformant/extend-tests/079_test_pseudoelement_remains_at_end_of_selector.hrx
diff --git a/spec/extend-tests/080_test_pseudoclass_remains_at_end_of_selector.hrx b/spec/non_conformant/extend-tests/080_test_pseudoclass_remains_at_end_of_selector.hrx
similarity index 100%
rename from spec/extend-tests/080_test_pseudoclass_remains_at_end_of_selector.hrx
rename to spec/non_conformant/extend-tests/080_test_pseudoclass_remains_at_end_of_selector.hrx
diff --git a/spec/extend-tests/081_test_pseudoclass_remains_at_end_of_selector.hrx b/spec/non_conformant/extend-tests/081_test_pseudoclass_remains_at_end_of_selector.hrx
similarity index 100%
rename from spec/extend-tests/081_test_pseudoclass_remains_at_end_of_selector.hrx
rename to spec/non_conformant/extend-tests/081_test_pseudoclass_remains_at_end_of_selector.hrx
diff --git a/spec/extend-tests/082_test_not_remains_at_end_of_selector.hrx b/spec/non_conformant/extend-tests/082_test_not_remains_at_end_of_selector.hrx
similarity index 100%
rename from spec/extend-tests/082_test_not_remains_at_end_of_selector.hrx
rename to spec/non_conformant/extend-tests/082_test_not_remains_at_end_of_selector.hrx
diff --git a/spec/extend-tests/083_test_pseudoelement_goes_lefter_than_pseudoclass.hrx b/spec/non_conformant/extend-tests/083_test_pseudoelement_goes_lefter_than_pseudoclass.hrx
similarity index 100%
rename from spec/extend-tests/083_test_pseudoelement_goes_lefter_than_pseudoclass.hrx
rename to spec/non_conformant/extend-tests/083_test_pseudoelement_goes_lefter_than_pseudoclass.hrx
diff --git a/spec/extend-tests/084_test_pseudoelement_goes_lefter_than_pseudoclass.hrx b/spec/non_conformant/extend-tests/084_test_pseudoelement_goes_lefter_than_pseudoclass.hrx
similarity index 100%
rename from spec/extend-tests/084_test_pseudoelement_goes_lefter_than_pseudoclass.hrx
rename to spec/non_conformant/extend-tests/084_test_pseudoelement_goes_lefter_than_pseudoclass.hrx
diff --git a/spec/extend-tests/085_test_pseudoelement_goes_lefter_than_not.hrx b/spec/non_conformant/extend-tests/085_test_pseudoelement_goes_lefter_than_not.hrx
similarity index 100%
rename from spec/extend-tests/085_test_pseudoelement_goes_lefter_than_not.hrx
rename to spec/non_conformant/extend-tests/085_test_pseudoelement_goes_lefter_than_not.hrx
diff --git a/spec/extend-tests/086.1_test_pseudoelement_goes_lefter_than_not.hrx b/spec/non_conformant/extend-tests/086.1_test_pseudoelement_goes_lefter_than_not.hrx
similarity index 100%
rename from spec/extend-tests/086.1_test_pseudoelement_goes_lefter_than_not.hrx
rename to spec/non_conformant/extend-tests/086.1_test_pseudoelement_goes_lefter_than_not.hrx
diff --git a/spec/extend-tests/086_test_pseudoelement_goes_lefter_than_not.hrx b/spec/non_conformant/extend-tests/086_test_pseudoelement_goes_lefter_than_not.hrx
similarity index 100%
rename from spec/extend-tests/086_test_pseudoelement_goes_lefter_than_not.hrx
rename to spec/non_conformant/extend-tests/086_test_pseudoelement_goes_lefter_than_not.hrx
diff --git a/spec/extend-tests/087_test_negation_unification.hrx b/spec/non_conformant/extend-tests/087_test_negation_unification.hrx
similarity index 100%
rename from spec/extend-tests/087_test_negation_unification.hrx
rename to spec/non_conformant/extend-tests/087_test_negation_unification.hrx
diff --git a/spec/extend-tests/088_test_negation_unification.hrx b/spec/non_conformant/extend-tests/088_test_negation_unification.hrx
similarity index 100%
rename from spec/extend-tests/088_test_negation_unification.hrx
rename to spec/non_conformant/extend-tests/088_test_negation_unification.hrx
diff --git a/spec/extend-tests/089_test_negation_unification.hrx b/spec/non_conformant/extend-tests/089_test_negation_unification.hrx
similarity index 100%
rename from spec/extend-tests/089_test_negation_unification.hrx
rename to spec/non_conformant/extend-tests/089_test_negation_unification.hrx
diff --git a/spec/extend-tests/090_test_comma_extendee.hrx b/spec/non_conformant/extend-tests/090_test_comma_extendee.hrx
similarity index 100%
rename from spec/extend-tests/090_test_comma_extendee.hrx
rename to spec/non_conformant/extend-tests/090_test_comma_extendee.hrx
diff --git a/spec/extend-tests/091_test_redundant_selector_elimination.hrx b/spec/non_conformant/extend-tests/091_test_redundant_selector_elimination.hrx
similarity index 100%
rename from spec/extend-tests/091_test_redundant_selector_elimination.hrx
rename to spec/non_conformant/extend-tests/091_test_redundant_selector_elimination.hrx
diff --git a/spec/extend-tests/094_test_long_extendee_runs_unification.hrx b/spec/non_conformant/extend-tests/094_test_long_extendee_runs_unification.hrx
similarity index 100%
rename from spec/extend-tests/094_test_long_extendee_runs_unification.hrx
rename to spec/non_conformant/extend-tests/094_test_long_extendee_runs_unification.hrx
diff --git a/spec/extend-tests/095_test_long_extender.hrx b/spec/non_conformant/extend-tests/095_test_long_extender.hrx
similarity index 100%
rename from spec/extend-tests/095_test_long_extender.hrx
rename to spec/non_conformant/extend-tests/095_test_long_extender.hrx
diff --git a/spec/extend-tests/096_test_long_extender_runs_unification.hrx b/spec/non_conformant/extend-tests/096_test_long_extender_runs_unification.hrx
similarity index 100%
rename from spec/extend-tests/096_test_long_extender_runs_unification.hrx
rename to spec/non_conformant/extend-tests/096_test_long_extender_runs_unification.hrx
diff --git a/spec/extend-tests/097_test_nested_extender.hrx b/spec/non_conformant/extend-tests/097_test_nested_extender.hrx
similarity index 100%
rename from spec/extend-tests/097_test_nested_extender.hrx
rename to spec/non_conformant/extend-tests/097_test_nested_extender.hrx
diff --git a/spec/extend-tests/098_test_nested_extender_runs_unification.hrx b/spec/non_conformant/extend-tests/098_test_nested_extender_runs_unification.hrx
similarity index 100%
rename from spec/extend-tests/098_test_nested_extender_runs_unification.hrx
rename to spec/non_conformant/extend-tests/098_test_nested_extender_runs_unification.hrx
diff --git a/spec/extend-tests/099_test_nested_extender_alternates_parents.hrx b/spec/non_conformant/extend-tests/099_test_nested_extender_alternates_parents.hrx
similarity index 100%
rename from spec/extend-tests/099_test_nested_extender_alternates_parents.hrx
rename to spec/non_conformant/extend-tests/099_test_nested_extender_alternates_parents.hrx
diff --git a/spec/extend-tests/100_test_nested_extender_unifies_identical_parents.hrx b/spec/non_conformant/extend-tests/100_test_nested_extender_unifies_identical_parents.hrx
similarity index 100%
rename from spec/extend-tests/100_test_nested_extender_unifies_identical_parents.hrx
rename to spec/non_conformant/extend-tests/100_test_nested_extender_unifies_identical_parents.hrx
diff --git a/spec/extend-tests/101_test_nested_extender_unifies_common_substring.hrx b/spec/non_conformant/extend-tests/101_test_nested_extender_unifies_common_substring.hrx
similarity index 100%
rename from spec/extend-tests/101_test_nested_extender_unifies_common_substring.hrx
rename to spec/non_conformant/extend-tests/101_test_nested_extender_unifies_common_substring.hrx
diff --git a/spec/extend-tests/102_test_nested_extender_unifies_common_subseq.hrx b/spec/non_conformant/extend-tests/102_test_nested_extender_unifies_common_subseq.hrx
similarity index 100%
rename from spec/extend-tests/102_test_nested_extender_unifies_common_subseq.hrx
rename to spec/non_conformant/extend-tests/102_test_nested_extender_unifies_common_subseq.hrx
diff --git a/spec/extend-tests/103_test_nested_extender_chooses_first_subseq.hrx b/spec/non_conformant/extend-tests/103_test_nested_extender_chooses_first_subseq.hrx
similarity index 100%
rename from spec/extend-tests/103_test_nested_extender_chooses_first_subseq.hrx
rename to spec/non_conformant/extend-tests/103_test_nested_extender_chooses_first_subseq.hrx
diff --git a/spec/extend-tests/104_test_nested_extender_counts_extended_subselectors/104_test_nested_extender_counts_extended_subselectors.hrx b/spec/non_conformant/extend-tests/104_test_nested_extender_counts_extended_subselectors/104_test_nested_extender_counts_extended_subselectors.hrx
similarity index 100%
rename from spec/extend-tests/104_test_nested_extender_counts_extended_subselectors/104_test_nested_extender_counts_extended_subselectors.hrx
rename to spec/non_conformant/extend-tests/104_test_nested_extender_counts_extended_subselectors/104_test_nested_extender_counts_extended_subselectors.hrx
diff --git a/spec/extend-tests/105_test_nested_extender_counts_extended_superselectors.hrx b/spec/non_conformant/extend-tests/105_test_nested_extender_counts_extended_superselectors.hrx
similarity index 100%
rename from spec/extend-tests/105_test_nested_extender_counts_extended_superselectors.hrx
rename to spec/non_conformant/extend-tests/105_test_nested_extender_counts_extended_superselectors.hrx
diff --git a/spec/extend-tests/106_test_nested_extender_with_child_selector.hrx b/spec/non_conformant/extend-tests/106_test_nested_extender_with_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/106_test_nested_extender_with_child_selector.hrx
rename to spec/non_conformant/extend-tests/106_test_nested_extender_with_child_selector.hrx
diff --git a/spec/extend-tests/107_test_nested_extender_finds_common_selectors_around_child_selector.hrx b/spec/non_conformant/extend-tests/107_test_nested_extender_finds_common_selectors_around_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/107_test_nested_extender_finds_common_selectors_around_child_selector.hrx
rename to spec/non_conformant/extend-tests/107_test_nested_extender_finds_common_selectors_around_child_selector.hrx
diff --git a/spec/extend-tests/108_test_nested_extender_finds_common_selectors_around_child_selector.hrx b/spec/non_conformant/extend-tests/108_test_nested_extender_finds_common_selectors_around_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/108_test_nested_extender_finds_common_selectors_around_child_selector.hrx
rename to spec/non_conformant/extend-tests/108_test_nested_extender_finds_common_selectors_around_child_selector.hrx
diff --git a/spec/extend-tests/109_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx b/spec/non_conformant/extend-tests/109_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
similarity index 100%
rename from spec/extend-tests/109_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
rename to spec/non_conformant/extend-tests/109_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
diff --git a/spec/extend-tests/110_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx b/spec/non_conformant/extend-tests/110_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
similarity index 100%
rename from spec/extend-tests/110_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
rename to spec/non_conformant/extend-tests/110_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
diff --git a/spec/extend-tests/111_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx b/spec/non_conformant/extend-tests/111_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
similarity index 100%
rename from spec/extend-tests/111_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
rename to spec/non_conformant/extend-tests/111_test_nested_extender_finds_common_selectors_around_adjacent_sibling.hrx
diff --git a/spec/extend-tests/112_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx b/spec/non_conformant/extend-tests/112_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
similarity index 100%
rename from spec/extend-tests/112_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
rename to spec/non_conformant/extend-tests/112_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
diff --git a/spec/extend-tests/113_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx b/spec/non_conformant/extend-tests/113_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
similarity index 100%
rename from spec/extend-tests/113_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
rename to spec/non_conformant/extend-tests/113_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
diff --git a/spec/extend-tests/114_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx b/spec/non_conformant/extend-tests/114_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
similarity index 100%
rename from spec/extend-tests/114_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
rename to spec/non_conformant/extend-tests/114_test_nested_extender_finds_common_selectors_around_sibling_selector.hrx
diff --git a/spec/extend-tests/118_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx b/spec/non_conformant/extend-tests/118_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx
similarity index 100%
rename from spec/extend-tests/118_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx
rename to spec/non_conformant/extend-tests/118_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx
diff --git a/spec/extend-tests/119_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx b/spec/non_conformant/extend-tests/119_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx
similarity index 100%
rename from spec/extend-tests/119_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx
rename to spec/non_conformant/extend-tests/119_test_nested_extender_with_early_child_selectors_doesnt_subseq_them.hrx
diff --git a/spec/extend-tests/120_test_nested_extender_with_child_selector_unifies.hrx b/spec/non_conformant/extend-tests/120_test_nested_extender_with_child_selector_unifies.hrx
similarity index 100%
rename from spec/extend-tests/120_test_nested_extender_with_child_selector_unifies.hrx
rename to spec/non_conformant/extend-tests/120_test_nested_extender_with_child_selector_unifies.hrx
diff --git a/spec/extend-tests/121_test_nested_extender_with_child_selector_unifies.hrx b/spec/non_conformant/extend-tests/121_test_nested_extender_with_child_selector_unifies.hrx
similarity index 100%
rename from spec/extend-tests/121_test_nested_extender_with_child_selector_unifies.hrx
rename to spec/non_conformant/extend-tests/121_test_nested_extender_with_child_selector_unifies.hrx
diff --git a/spec/extend-tests/122_test_nested_extender_with_child_selector_unifies.hrx b/spec/non_conformant/extend-tests/122_test_nested_extender_with_child_selector_unifies.hrx
similarity index 100%
rename from spec/extend-tests/122_test_nested_extender_with_child_selector_unifies.hrx
rename to spec/non_conformant/extend-tests/122_test_nested_extender_with_child_selector_unifies.hrx
diff --git a/spec/extend-tests/123_test_nested_extender_with_early_child_selector.hrx b/spec/non_conformant/extend-tests/123_test_nested_extender_with_early_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/123_test_nested_extender_with_early_child_selector.hrx
rename to spec/non_conformant/extend-tests/123_test_nested_extender_with_early_child_selector.hrx
diff --git a/spec/extend-tests/124_test_nested_extender_with_early_child_selector.hrx b/spec/non_conformant/extend-tests/124_test_nested_extender_with_early_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/124_test_nested_extender_with_early_child_selector.hrx
rename to spec/non_conformant/extend-tests/124_test_nested_extender_with_early_child_selector.hrx
diff --git a/spec/extend-tests/125_test_nested_extender_with_early_child_selector.hrx b/spec/non_conformant/extend-tests/125_test_nested_extender_with_early_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/125_test_nested_extender_with_early_child_selector.hrx
rename to spec/non_conformant/extend-tests/125_test_nested_extender_with_early_child_selector.hrx
diff --git a/spec/extend-tests/126_test_nested_extender_with_early_child_selector.hrx b/spec/non_conformant/extend-tests/126_test_nested_extender_with_early_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/126_test_nested_extender_with_early_child_selector.hrx
rename to spec/non_conformant/extend-tests/126_test_nested_extender_with_early_child_selector.hrx
diff --git a/spec/extend-tests/127_test_nested_extender_with_early_child_selector.hrx b/spec/non_conformant/extend-tests/127_test_nested_extender_with_early_child_selector.hrx
similarity index 100%
rename from spec/extend-tests/127_test_nested_extender_with_early_child_selector.hrx
rename to spec/non_conformant/extend-tests/127_test_nested_extender_with_early_child_selector.hrx
diff --git a/spec/extend-tests/128_test_nested_extender_with_sibling_selector.hrx b/spec/non_conformant/extend-tests/128_test_nested_extender_with_sibling_selector.hrx
similarity index 100%
rename from spec/extend-tests/128_test_nested_extender_with_sibling_selector.hrx
rename to spec/non_conformant/extend-tests/128_test_nested_extender_with_sibling_selector.hrx
diff --git a/spec/extend-tests/129_test_nested_extender_with_hacky_selector.hrx b/spec/non_conformant/extend-tests/129_test_nested_extender_with_hacky_selector.hrx
similarity index 100%
rename from spec/extend-tests/129_test_nested_extender_with_hacky_selector.hrx
rename to spec/non_conformant/extend-tests/129_test_nested_extender_with_hacky_selector.hrx
diff --git a/spec/extend-tests/130_test_nested_extender_with_hacky_selector.hrx b/spec/non_conformant/extend-tests/130_test_nested_extender_with_hacky_selector.hrx
similarity index 100%
rename from spec/extend-tests/130_test_nested_extender_with_hacky_selector.hrx
rename to spec/non_conformant/extend-tests/130_test_nested_extender_with_hacky_selector.hrx
diff --git a/spec/extend-tests/131_test_nested_extender_merges_with_same_selector.hrx b/spec/non_conformant/extend-tests/131_test_nested_extender_merges_with_same_selector.hrx
similarity index 100%
rename from spec/extend-tests/131_test_nested_extender_merges_with_same_selector.hrx
rename to spec/non_conformant/extend-tests/131_test_nested_extender_merges_with_same_selector.hrx
diff --git a/spec/extend-tests/132_test_nested_extender_with_child_selector_merges_with_same_selector.hrx b/spec/non_conformant/extend-tests/132_test_nested_extender_with_child_selector_merges_with_same_selector.hrx
similarity index 100%
rename from spec/extend-tests/132_test_nested_extender_with_child_selector_merges_with_same_selector.hrx
rename to spec/non_conformant/extend-tests/132_test_nested_extender_with_child_selector_merges_with_same_selector.hrx
diff --git a/spec/extend-tests/133_test_combinator_unification_for_hacky_combinators.hrx b/spec/non_conformant/extend-tests/133_test_combinator_unification_for_hacky_combinators.hrx
similarity index 100%
rename from spec/extend-tests/133_test_combinator_unification_for_hacky_combinators.hrx
rename to spec/non_conformant/extend-tests/133_test_combinator_unification_for_hacky_combinators.hrx
diff --git a/spec/extend-tests/134_test_combinator_unification_for_hacky_combinators.hrx b/spec/non_conformant/extend-tests/134_test_combinator_unification_for_hacky_combinators.hrx
similarity index 100%
rename from spec/extend-tests/134_test_combinator_unification_for_hacky_combinators.hrx
rename to spec/non_conformant/extend-tests/134_test_combinator_unification_for_hacky_combinators.hrx
diff --git a/spec/extend-tests/135_test_combinator_unification_for_hacky_combinators.hrx b/spec/non_conformant/extend-tests/135_test_combinator_unification_for_hacky_combinators.hrx
similarity index 100%
rename from spec/extend-tests/135_test_combinator_unification_for_hacky_combinators.hrx
rename to spec/non_conformant/extend-tests/135_test_combinator_unification_for_hacky_combinators.hrx
diff --git a/spec/extend-tests/136_test_combinator_unification_for_hacky_combinators.hrx b/spec/non_conformant/extend-tests/136_test_combinator_unification_for_hacky_combinators.hrx
similarity index 100%
rename from spec/extend-tests/136_test_combinator_unification_for_hacky_combinators.hrx
rename to spec/non_conformant/extend-tests/136_test_combinator_unification_for_hacky_combinators.hrx
diff --git a/spec/extend-tests/137_test_combinator_unification_for_hacky_combinators.hrx b/spec/non_conformant/extend-tests/137_test_combinator_unification_for_hacky_combinators.hrx
similarity index 100%
rename from spec/extend-tests/137_test_combinator_unification_for_hacky_combinators.hrx
rename to spec/non_conformant/extend-tests/137_test_combinator_unification_for_hacky_combinators.hrx
diff --git a/spec/extend-tests/138_test_combinator_unification_for_hacky_combinators.hrx b/spec/non_conformant/extend-tests/138_test_combinator_unification_for_hacky_combinators.hrx
similarity index 100%
rename from spec/extend-tests/138_test_combinator_unification_for_hacky_combinators.hrx
rename to spec/non_conformant/extend-tests/138_test_combinator_unification_for_hacky_combinators.hrx
diff --git a/spec/extend-tests/139_test_combinator_unification_for_hacky_combinators.hrx b/spec/non_conformant/extend-tests/139_test_combinator_unification_for_hacky_combinators.hrx
similarity index 100%
rename from spec/extend-tests/139_test_combinator_unification_for_hacky_combinators.hrx
rename to spec/non_conformant/extend-tests/139_test_combinator_unification_for_hacky_combinators.hrx
diff --git a/spec/extend-tests/140_test_combinator_unification_double_tilde.hrx b/spec/non_conformant/extend-tests/140_test_combinator_unification_double_tilde.hrx
similarity index 100%
rename from spec/extend-tests/140_test_combinator_unification_double_tilde.hrx
rename to spec/non_conformant/extend-tests/140_test_combinator_unification_double_tilde.hrx
diff --git a/spec/extend-tests/141_test_combinator_unification_double_tilde.hrx b/spec/non_conformant/extend-tests/141_test_combinator_unification_double_tilde.hrx
similarity index 100%
rename from spec/extend-tests/141_test_combinator_unification_double_tilde.hrx
rename to spec/non_conformant/extend-tests/141_test_combinator_unification_double_tilde.hrx
diff --git a/spec/extend-tests/142_test_combinator_unification_double_tilde.hrx b/spec/non_conformant/extend-tests/142_test_combinator_unification_double_tilde.hrx
similarity index 100%
rename from spec/extend-tests/142_test_combinator_unification_double_tilde.hrx
rename to spec/non_conformant/extend-tests/142_test_combinator_unification_double_tilde.hrx
diff --git a/spec/extend-tests/143_test_combinator_unification_double_tilde.hrx b/spec/non_conformant/extend-tests/143_test_combinator_unification_double_tilde.hrx
similarity index 100%
rename from spec/extend-tests/143_test_combinator_unification_double_tilde.hrx
rename to spec/non_conformant/extend-tests/143_test_combinator_unification_double_tilde.hrx
diff --git a/spec/extend-tests/144_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/144_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/144_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/144_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/145_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/145_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/145_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/145_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/146_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/146_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/146_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/146_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/147_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/147_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/147_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/147_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/148_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/148_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/148_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/148_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/149_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/149_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/149_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/149_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/150_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/150_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/150_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/150_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/151_test_combinator_unification_tilde_plus.hrx b/spec/non_conformant/extend-tests/151_test_combinator_unification_tilde_plus.hrx
similarity index 100%
rename from spec/extend-tests/151_test_combinator_unification_tilde_plus.hrx
rename to spec/non_conformant/extend-tests/151_test_combinator_unification_tilde_plus.hrx
diff --git a/spec/extend-tests/152_test_combinator_unification_angle_sibling.hrx b/spec/non_conformant/extend-tests/152_test_combinator_unification_angle_sibling.hrx
similarity index 100%
rename from spec/extend-tests/152_test_combinator_unification_angle_sibling.hrx
rename to spec/non_conformant/extend-tests/152_test_combinator_unification_angle_sibling.hrx
diff --git a/spec/extend-tests/153_test_combinator_unification_angle_sibling.hrx b/spec/non_conformant/extend-tests/153_test_combinator_unification_angle_sibling.hrx
similarity index 100%
rename from spec/extend-tests/153_test_combinator_unification_angle_sibling.hrx
rename to spec/non_conformant/extend-tests/153_test_combinator_unification_angle_sibling.hrx
diff --git a/spec/extend-tests/154_test_combinator_unification_angle_sibling.hrx b/spec/non_conformant/extend-tests/154_test_combinator_unification_angle_sibling.hrx
similarity index 100%
rename from spec/extend-tests/154_test_combinator_unification_angle_sibling.hrx
rename to spec/non_conformant/extend-tests/154_test_combinator_unification_angle_sibling.hrx
diff --git a/spec/extend-tests/155_test_combinator_unification_angle_sibling.hrx b/spec/non_conformant/extend-tests/155_test_combinator_unification_angle_sibling.hrx
similarity index 100%
rename from spec/extend-tests/155_test_combinator_unification_angle_sibling.hrx
rename to spec/non_conformant/extend-tests/155_test_combinator_unification_angle_sibling.hrx
diff --git a/spec/extend-tests/156_test_combinator_unification_double_angle.hrx b/spec/non_conformant/extend-tests/156_test_combinator_unification_double_angle.hrx
similarity index 100%
rename from spec/extend-tests/156_test_combinator_unification_double_angle.hrx
rename to spec/non_conformant/extend-tests/156_test_combinator_unification_double_angle.hrx
diff --git a/spec/extend-tests/157_test_combinator_unification_double_angle.hrx b/spec/non_conformant/extend-tests/157_test_combinator_unification_double_angle.hrx
similarity index 100%
rename from spec/extend-tests/157_test_combinator_unification_double_angle.hrx
rename to spec/non_conformant/extend-tests/157_test_combinator_unification_double_angle.hrx
diff --git a/spec/extend-tests/158_test_combinator_unification_double_angle.hrx b/spec/non_conformant/extend-tests/158_test_combinator_unification_double_angle.hrx
similarity index 100%
rename from spec/extend-tests/158_test_combinator_unification_double_angle.hrx
rename to spec/non_conformant/extend-tests/158_test_combinator_unification_double_angle.hrx
diff --git a/spec/extend-tests/159_test_combinator_unification_double_angle.hrx b/spec/non_conformant/extend-tests/159_test_combinator_unification_double_angle.hrx
similarity index 100%
rename from spec/extend-tests/159_test_combinator_unification_double_angle.hrx
rename to spec/non_conformant/extend-tests/159_test_combinator_unification_double_angle.hrx
diff --git a/spec/extend-tests/160_test_combinator_unification_double_plus.hrx b/spec/non_conformant/extend-tests/160_test_combinator_unification_double_plus.hrx
similarity index 100%
rename from spec/extend-tests/160_test_combinator_unification_double_plus.hrx
rename to spec/non_conformant/extend-tests/160_test_combinator_unification_double_plus.hrx
diff --git a/spec/extend-tests/161_test_combinator_unification_double_plus.hrx b/spec/non_conformant/extend-tests/161_test_combinator_unification_double_plus.hrx
similarity index 100%
rename from spec/extend-tests/161_test_combinator_unification_double_plus.hrx
rename to spec/non_conformant/extend-tests/161_test_combinator_unification_double_plus.hrx
diff --git a/spec/extend-tests/162_test_combinator_unification_double_plus.hrx b/spec/non_conformant/extend-tests/162_test_combinator_unification_double_plus.hrx
similarity index 100%
rename from spec/extend-tests/162_test_combinator_unification_double_plus.hrx
rename to spec/non_conformant/extend-tests/162_test_combinator_unification_double_plus.hrx
diff --git a/spec/extend-tests/163_test_combinator_unification_double_plus.hrx b/spec/non_conformant/extend-tests/163_test_combinator_unification_double_plus.hrx
similarity index 100%
rename from spec/extend-tests/163_test_combinator_unification_double_plus.hrx
rename to spec/non_conformant/extend-tests/163_test_combinator_unification_double_plus.hrx
diff --git a/spec/extend-tests/164_test_combinator_unification_angle_space.hrx b/spec/non_conformant/extend-tests/164_test_combinator_unification_angle_space.hrx
similarity index 100%
rename from spec/extend-tests/164_test_combinator_unification_angle_space.hrx
rename to spec/non_conformant/extend-tests/164_test_combinator_unification_angle_space.hrx
diff --git a/spec/extend-tests/165_test_combinator_unification_angle_space.hrx b/spec/non_conformant/extend-tests/165_test_combinator_unification_angle_space.hrx
similarity index 100%
rename from spec/extend-tests/165_test_combinator_unification_angle_space.hrx
rename to spec/non_conformant/extend-tests/165_test_combinator_unification_angle_space.hrx
diff --git a/spec/extend-tests/166_test_combinator_unification_angle_space.hrx b/spec/non_conformant/extend-tests/166_test_combinator_unification_angle_space.hrx
similarity index 100%
rename from spec/extend-tests/166_test_combinator_unification_angle_space.hrx
rename to spec/non_conformant/extend-tests/166_test_combinator_unification_angle_space.hrx
diff --git a/spec/extend-tests/167_test_combinator_unification_angle_space.hrx b/spec/non_conformant/extend-tests/167_test_combinator_unification_angle_space.hrx
similarity index 100%
rename from spec/extend-tests/167_test_combinator_unification_angle_space.hrx
rename to spec/non_conformant/extend-tests/167_test_combinator_unification_angle_space.hrx
diff --git a/spec/extend-tests/168_test_combinator_unification_angle_space.hrx b/spec/non_conformant/extend-tests/168_test_combinator_unification_angle_space.hrx
similarity index 100%
rename from spec/extend-tests/168_test_combinator_unification_angle_space.hrx
rename to spec/non_conformant/extend-tests/168_test_combinator_unification_angle_space.hrx
diff --git a/spec/extend-tests/169_test_combinator_unification_angle_space.hrx b/spec/non_conformant/extend-tests/169_test_combinator_unification_angle_space.hrx
similarity index 100%
rename from spec/extend-tests/169_test_combinator_unification_angle_space.hrx
rename to spec/non_conformant/extend-tests/169_test_combinator_unification_angle_space.hrx
diff --git a/spec/extend-tests/170_test_combinator_unification_plus_space.hrx b/spec/non_conformant/extend-tests/170_test_combinator_unification_plus_space.hrx
similarity index 100%
rename from spec/extend-tests/170_test_combinator_unification_plus_space.hrx
rename to spec/non_conformant/extend-tests/170_test_combinator_unification_plus_space.hrx
diff --git a/spec/extend-tests/171_test_combinator_unification_plus_space.hrx b/spec/non_conformant/extend-tests/171_test_combinator_unification_plus_space.hrx
similarity index 100%
rename from spec/extend-tests/171_test_combinator_unification_plus_space.hrx
rename to spec/non_conformant/extend-tests/171_test_combinator_unification_plus_space.hrx
diff --git a/spec/extend-tests/172_test_combinator_unification_plus_space.hrx b/spec/non_conformant/extend-tests/172_test_combinator_unification_plus_space.hrx
similarity index 100%
rename from spec/extend-tests/172_test_combinator_unification_plus_space.hrx
rename to spec/non_conformant/extend-tests/172_test_combinator_unification_plus_space.hrx
diff --git a/spec/extend-tests/173_test_combinator_unification_plus_space.hrx b/spec/non_conformant/extend-tests/173_test_combinator_unification_plus_space.hrx
similarity index 100%
rename from spec/extend-tests/173_test_combinator_unification_plus_space.hrx
rename to spec/non_conformant/extend-tests/173_test_combinator_unification_plus_space.hrx
diff --git a/spec/extend-tests/174_test_combinator_unification_plus_space.hrx b/spec/non_conformant/extend-tests/174_test_combinator_unification_plus_space.hrx
similarity index 100%
rename from spec/extend-tests/174_test_combinator_unification_plus_space.hrx
rename to spec/non_conformant/extend-tests/174_test_combinator_unification_plus_space.hrx
diff --git a/spec/extend-tests/175_test_combinator_unification_plus_space.hrx b/spec/non_conformant/extend-tests/175_test_combinator_unification_plus_space.hrx
similarity index 100%
rename from spec/extend-tests/175_test_combinator_unification_plus_space.hrx
rename to spec/non_conformant/extend-tests/175_test_combinator_unification_plus_space.hrx
diff --git a/spec/extend-tests/176_test_combinator_unification_nested.hrx b/spec/non_conformant/extend-tests/176_test_combinator_unification_nested.hrx
similarity index 100%
rename from spec/extend-tests/176_test_combinator_unification_nested.hrx
rename to spec/non_conformant/extend-tests/176_test_combinator_unification_nested.hrx
diff --git a/spec/extend-tests/177_test_combinator_unification_nested.hrx b/spec/non_conformant/extend-tests/177_test_combinator_unification_nested.hrx
similarity index 100%
rename from spec/extend-tests/177_test_combinator_unification_nested.hrx
rename to spec/non_conformant/extend-tests/177_test_combinator_unification_nested.hrx
diff --git a/spec/extend-tests/178_test_combinator_unification_with_newlines.hrx b/spec/non_conformant/extend-tests/178_test_combinator_unification_with_newlines.hrx
similarity index 100%
rename from spec/extend-tests/178_test_combinator_unification_with_newlines.hrx
rename to spec/non_conformant/extend-tests/178_test_combinator_unification_with_newlines.hrx
diff --git a/spec/extend-tests/179_test_extend_self_loop.hrx b/spec/non_conformant/extend-tests/179_test_extend_self_loop.hrx
similarity index 100%
rename from spec/extend-tests/179_test_extend_self_loop.hrx
rename to spec/non_conformant/extend-tests/179_test_extend_self_loop.hrx
diff --git a/spec/extend-tests/180_test_basic_extend_loop.hrx b/spec/non_conformant/extend-tests/180_test_basic_extend_loop.hrx
similarity index 100%
rename from spec/extend-tests/180_test_basic_extend_loop.hrx
rename to spec/non_conformant/extend-tests/180_test_basic_extend_loop.hrx
diff --git a/spec/extend-tests/181_test_three_level_extend_loop.hrx b/spec/non_conformant/extend-tests/181_test_three_level_extend_loop.hrx
similarity index 100%
rename from spec/extend-tests/181_test_three_level_extend_loop.hrx
rename to spec/non_conformant/extend-tests/181_test_three_level_extend_loop.hrx
diff --git a/spec/extend-tests/182_test_nested_extend_loop.hrx b/spec/non_conformant/extend-tests/182_test_nested_extend_loop.hrx
similarity index 100%
rename from spec/extend-tests/182_test_nested_extend_loop.hrx
rename to spec/non_conformant/extend-tests/182_test_nested_extend_loop.hrx
diff --git a/spec/extend-tests/183_test_multiple_extender_merges_with_superset_selector.hrx b/spec/non_conformant/extend-tests/183_test_multiple_extender_merges_with_superset_selector.hrx
similarity index 100%
rename from spec/extend-tests/183_test_multiple_extender_merges_with_superset_selector.hrx
rename to spec/non_conformant/extend-tests/183_test_multiple_extender_merges_with_superset_selector.hrx
diff --git a/spec/extend-tests/184_test_control_flow_if.hrx b/spec/non_conformant/extend-tests/184_test_control_flow_if.hrx
similarity index 100%
rename from spec/extend-tests/184_test_control_flow_if.hrx
rename to spec/non_conformant/extend-tests/184_test_control_flow_if.hrx
diff --git a/spec/extend-tests/185_test_control_flow_for.hrx b/spec/non_conformant/extend-tests/185_test_control_flow_for.hrx
similarity index 100%
rename from spec/extend-tests/185_test_control_flow_for.hrx
rename to spec/non_conformant/extend-tests/185_test_control_flow_for.hrx
diff --git a/spec/extend-tests/186_test_control_flow_while.hrx b/spec/non_conformant/extend-tests/186_test_control_flow_while.hrx
similarity index 100%
rename from spec/extend-tests/186_test_control_flow_while.hrx
rename to spec/non_conformant/extend-tests/186_test_control_flow_while.hrx
diff --git a/spec/extend-tests/187_test_basic_placeholder_selector.hrx b/spec/non_conformant/extend-tests/187_test_basic_placeholder_selector.hrx
similarity index 100%
rename from spec/extend-tests/187_test_basic_placeholder_selector.hrx
rename to spec/non_conformant/extend-tests/187_test_basic_placeholder_selector.hrx
diff --git a/spec/extend-tests/188_test_unused_placeholder_selector.hrx b/spec/non_conformant/extend-tests/188_test_unused_placeholder_selector.hrx
similarity index 100%
rename from spec/extend-tests/188_test_unused_placeholder_selector.hrx
rename to spec/non_conformant/extend-tests/188_test_unused_placeholder_selector.hrx
diff --git a/spec/extend-tests/189_test_placeholder_descendant_selector.hrx b/spec/non_conformant/extend-tests/189_test_placeholder_descendant_selector.hrx
similarity index 100%
rename from spec/extend-tests/189_test_placeholder_descendant_selector.hrx
rename to spec/non_conformant/extend-tests/189_test_placeholder_descendant_selector.hrx
diff --git a/spec/extend-tests/190_test_semi_placeholder_selector.hrx b/spec/non_conformant/extend-tests/190_test_semi_placeholder_selector.hrx
similarity index 100%
rename from spec/extend-tests/190_test_semi_placeholder_selector.hrx
rename to spec/non_conformant/extend-tests/190_test_semi_placeholder_selector.hrx
diff --git a/spec/extend-tests/191_test_placeholder_selector_with_multiple_extenders.hrx b/spec/non_conformant/extend-tests/191_test_placeholder_selector_with_multiple_extenders.hrx
similarity index 100%
rename from spec/extend-tests/191_test_placeholder_selector_with_multiple_extenders.hrx
rename to spec/non_conformant/extend-tests/191_test_placeholder_selector_with_multiple_extenders.hrx
diff --git a/spec/extend-tests/192_test_placeholder_interpolation.hrx b/spec/non_conformant/extend-tests/192_test_placeholder_interpolation.hrx
similarity index 100%
rename from spec/extend-tests/192_test_placeholder_interpolation.hrx
rename to spec/non_conformant/extend-tests/192_test_placeholder_interpolation.hrx
diff --git a/spec/extend-tests/193_test_media_in_placeholder_selector.hrx b/spec/non_conformant/extend-tests/193_test_media_in_placeholder_selector.hrx
similarity index 100%
rename from spec/extend-tests/193_test_media_in_placeholder_selector.hrx
rename to spec/non_conformant/extend-tests/193_test_media_in_placeholder_selector.hrx
diff --git a/spec/extend-tests/194_test_extend_within_media.hrx b/spec/non_conformant/extend-tests/194_test_extend_within_media.hrx
similarity index 100%
rename from spec/extend-tests/194_test_extend_within_media.hrx
rename to spec/non_conformant/extend-tests/194_test_extend_within_media.hrx
diff --git a/spec/extend-tests/195_test_extend_within_unknown_directive.hrx b/spec/non_conformant/extend-tests/195_test_extend_within_unknown_directive.hrx
similarity index 100%
rename from spec/extend-tests/195_test_extend_within_unknown_directive.hrx
rename to spec/non_conformant/extend-tests/195_test_extend_within_unknown_directive.hrx
diff --git a/spec/extend-tests/196_test_extend_within_nested_directives.hrx b/spec/non_conformant/extend-tests/196_test_extend_within_nested_directives.hrx
similarity index 100%
rename from spec/extend-tests/196_test_extend_within_nested_directives.hrx
rename to spec/non_conformant/extend-tests/196_test_extend_within_nested_directives.hrx
diff --git a/spec/extend-tests/197_test_extend_within_disparate_media.hrx b/spec/non_conformant/extend-tests/197_test_extend_within_disparate_media.hrx
similarity index 100%
rename from spec/extend-tests/197_test_extend_within_disparate_media.hrx
rename to spec/non_conformant/extend-tests/197_test_extend_within_disparate_media.hrx
diff --git a/spec/extend-tests/198_test_extend_within_disparate_unknown_directive.hrx b/spec/non_conformant/extend-tests/198_test_extend_within_disparate_unknown_directive.hrx
similarity index 100%
rename from spec/extend-tests/198_test_extend_within_disparate_unknown_directive.hrx
rename to spec/non_conformant/extend-tests/198_test_extend_within_disparate_unknown_directive.hrx
diff --git a/spec/extend-tests/199_test_extend_within_disparate_nested_directives.hrx b/spec/non_conformant/extend-tests/199_test_extend_within_disparate_nested_directives.hrx
similarity index 100%
rename from spec/extend-tests/199_test_extend_within_disparate_nested_directives.hrx
rename to spec/non_conformant/extend-tests/199_test_extend_within_disparate_nested_directives.hrx
diff --git a/spec/extend-tests/206_test_extend_succeeds_when_one_extension_fails_but_others_dont.hrx b/spec/non_conformant/extend-tests/206_test_extend_succeeds_when_one_extension_fails_but_others_dont.hrx
similarity index 100%
rename from spec/extend-tests/206_test_extend_succeeds_when_one_extension_fails_but_others_dont.hrx
rename to spec/non_conformant/extend-tests/206_test_extend_succeeds_when_one_extension_fails_but_others_dont.hrx
diff --git a/spec/extend-tests/207_test_optional_extend_succeeds_when_extendee_doesnt_exist.hrx b/spec/non_conformant/extend-tests/207_test_optional_extend_succeeds_when_extendee_doesnt_exist.hrx
similarity index 100%
rename from spec/extend-tests/207_test_optional_extend_succeeds_when_extendee_doesnt_exist.hrx
rename to spec/non_conformant/extend-tests/207_test_optional_extend_succeeds_when_extendee_doesnt_exist.hrx
diff --git a/spec/extend-tests/208_test_optional_extend_succeeds_when_extension_fails.hrx b/spec/non_conformant/extend-tests/208_test_optional_extend_succeeds_when_extension_fails.hrx
similarity index 100%
rename from spec/extend-tests/208_test_optional_extend_succeeds_when_extension_fails.hrx
rename to spec/non_conformant/extend-tests/208_test_optional_extend_succeeds_when_extension_fails.hrx
diff --git a/spec/extend-tests/209_test_pseudo_element_superselector.hrx b/spec/non_conformant/extend-tests/209_test_pseudo_element_superselector.hrx
similarity index 100%
rename from spec/extend-tests/209_test_pseudo_element_superselector.hrx
rename to spec/non_conformant/extend-tests/209_test_pseudo_element_superselector.hrx
diff --git a/spec/extend-tests/210_test_pseudo_element_superselector.hrx b/spec/non_conformant/extend-tests/210_test_pseudo_element_superselector.hrx
similarity index 100%
rename from spec/extend-tests/210_test_pseudo_element_superselector.hrx
rename to spec/non_conformant/extend-tests/210_test_pseudo_element_superselector.hrx
diff --git a/spec/extend-tests/211_test_pseudo_element_superselector.hrx b/spec/non_conformant/extend-tests/211_test_pseudo_element_superselector.hrx
similarity index 100%
rename from spec/extend-tests/211_test_pseudo_element_superselector.hrx
rename to spec/non_conformant/extend-tests/211_test_pseudo_element_superselector.hrx
diff --git a/spec/extend-tests/212_test_pseudo_element_superselector.hrx b/spec/non_conformant/extend-tests/212_test_pseudo_element_superselector.hrx
similarity index 100%
rename from spec/extend-tests/212_test_pseudo_element_superselector.hrx
rename to spec/non_conformant/extend-tests/212_test_pseudo_element_superselector.hrx
diff --git a/spec/extend-tests/213_test_pseudo_element_superselector.hrx b/spec/non_conformant/extend-tests/213_test_pseudo_element_superselector.hrx
similarity index 100%
rename from spec/extend-tests/213_test_pseudo_element_superselector.hrx
rename to spec/non_conformant/extend-tests/213_test_pseudo_element_superselector.hrx
diff --git a/spec/extend-tests/214_test_pseudo_element_superselector.hrx b/spec/non_conformant/extend-tests/214_test_pseudo_element_superselector.hrx
similarity index 100%
rename from spec/extend-tests/214_test_pseudo_element_superselector.hrx
rename to spec/non_conformant/extend-tests/214_test_pseudo_element_superselector.hrx
diff --git a/spec/extend-tests/215_test_multiple_source_redundancy_elimination.hrx b/spec/non_conformant/extend-tests/215_test_multiple_source_redundancy_elimination.hrx
similarity index 100%
rename from spec/extend-tests/215_test_multiple_source_redundancy_elimination.hrx
rename to spec/non_conformant/extend-tests/215_test_multiple_source_redundancy_elimination.hrx
diff --git a/spec/extend-tests/216_test_nested_sibling_extend.hrx b/spec/non_conformant/extend-tests/216_test_nested_sibling_extend.hrx
similarity index 100%
rename from spec/extend-tests/216_test_nested_sibling_extend.hrx
rename to spec/non_conformant/extend-tests/216_test_nested_sibling_extend.hrx
diff --git a/spec/extend-tests/217_test_parent_and_sibling_extend.hrx b/spec/non_conformant/extend-tests/217_test_parent_and_sibling_extend.hrx
similarity index 100%
rename from spec/extend-tests/217_test_parent_and_sibling_extend.hrx
rename to spec/non_conformant/extend-tests/217_test_parent_and_sibling_extend.hrx
diff --git a/spec/extend-tests/218_test_nested_extend_specificity.hrx b/spec/non_conformant/extend-tests/218_test_nested_extend_specificity.hrx
similarity index 100%
rename from spec/extend-tests/218_test_nested_extend_specificity.hrx
rename to spec/non_conformant/extend-tests/218_test_nested_extend_specificity.hrx
diff --git a/spec/extend-tests/219_test_nested_double_extend_optimization.hrx b/spec/non_conformant/extend-tests/219_test_nested_double_extend_optimization.hrx
similarity index 100%
rename from spec/extend-tests/219_test_nested_double_extend_optimization.hrx
rename to spec/non_conformant/extend-tests/219_test_nested_double_extend_optimization.hrx
diff --git a/spec/extend-tests/220_test_extend_in_double_nested_media_query.hrx b/spec/non_conformant/extend-tests/220_test_extend_in_double_nested_media_query.hrx
similarity index 100%
rename from spec/extend-tests/220_test_extend_in_double_nested_media_query.hrx
rename to spec/non_conformant/extend-tests/220_test_extend_in_double_nested_media_query.hrx
diff --git a/spec/extend-tests/221_test_partially_failed_extend.hrx b/spec/non_conformant/extend-tests/221_test_partially_failed_extend.hrx
similarity index 100%
rename from spec/extend-tests/221_test_partially_failed_extend.hrx
rename to spec/non_conformant/extend-tests/221_test_partially_failed_extend.hrx
diff --git a/spec/extend-tests/222_test_newline_near_combinator.hrx b/spec/non_conformant/extend-tests/222_test_newline_near_combinator.hrx
similarity index 100%
rename from spec/extend-tests/222_test_newline_near_combinator.hrx
rename to spec/non_conformant/extend-tests/222_test_newline_near_combinator.hrx
diff --git a/spec/extend-tests/223_test_duplicated_selector_with_newlines.hrx b/spec/non_conformant/extend-tests/223_test_duplicated_selector_with_newlines.hrx
similarity index 100%
rename from spec/extend-tests/223_test_duplicated_selector_with_newlines.hrx
rename to spec/non_conformant/extend-tests/223_test_duplicated_selector_with_newlines.hrx
diff --git a/spec/extend-tests/224_test_nested_selector_with_child_selector_hack_extendee.hrx b/spec/non_conformant/extend-tests/224_test_nested_selector_with_child_selector_hack_extendee.hrx
similarity index 100%
rename from spec/extend-tests/224_test_nested_selector_with_child_selector_hack_extendee.hrx
rename to spec/non_conformant/extend-tests/224_test_nested_selector_with_child_selector_hack_extendee.hrx
diff --git a/spec/extend-tests/225_test_nested_selector_with_child_selector_hack_extender.hrx b/spec/non_conformant/extend-tests/225_test_nested_selector_with_child_selector_hack_extender.hrx
similarity index 100%
rename from spec/extend-tests/225_test_nested_selector_with_child_selector_hack_extender.hrx
rename to spec/non_conformant/extend-tests/225_test_nested_selector_with_child_selector_hack_extender.hrx
diff --git a/spec/extend-tests/226_test_nested_selector_with_child_selector_hack_extender_and_extendee.hrx b/spec/non_conformant/extend-tests/226_test_nested_selector_with_child_selector_hack_extender_and_extendee.hrx
similarity index 100%
rename from spec/extend-tests/226_test_nested_selector_with_child_selector_hack_extender_and_extendee.hrx
rename to spec/non_conformant/extend-tests/226_test_nested_selector_with_child_selector_hack_extender_and_extendee.hrx
diff --git a/spec/extend-tests/227_test_nested_with_child_hack_extender_and_sibling_extendee.hrx b/spec/non_conformant/extend-tests/227_test_nested_with_child_hack_extender_and_sibling_extendee.hrx
similarity index 100%
rename from spec/extend-tests/227_test_nested_with_child_hack_extender_and_sibling_extendee.hrx
rename to spec/non_conformant/extend-tests/227_test_nested_with_child_hack_extender_and_sibling_extendee.hrx
diff --git a/spec/extend-tests/228_test_nested_with_child_selector_hack_extender_extendee_newline.hrx b/spec/non_conformant/extend-tests/228_test_nested_with_child_selector_hack_extender_extendee_newline.hrx
similarity index 100%
rename from spec/extend-tests/228_test_nested_with_child_selector_hack_extender_extendee_newline.hrx
rename to spec/non_conformant/extend-tests/228_test_nested_with_child_selector_hack_extender_extendee_newline.hrx
diff --git a/spec/extend-tests/229_test_extended_parent_and_child_redundancy_elimination.hrx b/spec/non_conformant/extend-tests/229_test_extended_parent_and_child_redundancy_elimination.hrx
similarity index 100%
rename from spec/extend-tests/229_test_extended_parent_and_child_redundancy_elimination.hrx
rename to spec/non_conformant/extend-tests/229_test_extended_parent_and_child_redundancy_elimination.hrx
diff --git a/spec/extend-tests/230_test_extend_redundancy_elimination_when_it_would_reduce_specificity.hrx b/spec/non_conformant/extend-tests/230_test_extend_redundancy_elimination_when_it_would_reduce_specificity.hrx
similarity index 100%
rename from spec/extend-tests/230_test_extend_redundancy_elimination_when_it_would_reduce_specificity.hrx
rename to spec/non_conformant/extend-tests/230_test_extend_redundancy_elimination_when_it_would_reduce_specificity.hrx
diff --git a/spec/extend-tests/231_test_extend_redundancy_elimination_when_it_would_preserve_specificity.hrx b/spec/non_conformant/extend-tests/231_test_extend_redundancy_elimination_when_it_would_preserve_specificity.hrx
similarity index 100%
rename from spec/extend-tests/231_test_extend_redundancy_elimination_when_it_would_preserve_specificity.hrx
rename to spec/non_conformant/extend-tests/231_test_extend_redundancy_elimination_when_it_would_preserve_specificity.hrx
diff --git a/spec/extend-tests/232_test_extend_redundancy_elimination_never_eliminates_base_selector.hrx b/spec/non_conformant/extend-tests/232_test_extend_redundancy_elimination_never_eliminates_base_selector.hrx
similarity index 100%
rename from spec/extend-tests/232_test_extend_redundancy_elimination_never_eliminates_base_selector.hrx
rename to spec/non_conformant/extend-tests/232_test_extend_redundancy_elimination_never_eliminates_base_selector.hrx
diff --git a/spec/extend-tests/233_test_extend_cross_branch_redundancy_elimination.hrx b/spec/non_conformant/extend-tests/233_test_extend_cross_branch_redundancy_elimination.hrx
similarity index 100%
rename from spec/extend-tests/233_test_extend_cross_branch_redundancy_elimination.hrx
rename to spec/non_conformant/extend-tests/233_test_extend_cross_branch_redundancy_elimination.hrx
diff --git a/spec/extend-tests/234_test_extend_cross_branch_redundancy_elimination.hrx b/spec/non_conformant/extend-tests/234_test_extend_cross_branch_redundancy_elimination.hrx
similarity index 100%
rename from spec/extend-tests/234_test_extend_cross_branch_redundancy_elimination.hrx
rename to spec/non_conformant/extend-tests/234_test_extend_cross_branch_redundancy_elimination.hrx
diff --git a/spec/extend-tests/235_extend_with_universal_selector.hrx b/spec/non_conformant/extend-tests/235_extend_with_universal_selector.hrx
similarity index 100%
rename from spec/extend-tests/235_extend_with_universal_selector.hrx
rename to spec/non_conformant/extend-tests/235_extend_with_universal_selector.hrx
diff --git a/spec/extend-tests/236_extend_with_universal_selector_empty_namespace.hrx b/spec/non_conformant/extend-tests/236_extend_with_universal_selector_empty_namespace.hrx
similarity index 100%
rename from spec/extend-tests/236_extend_with_universal_selector_empty_namespace.hrx
rename to spec/non_conformant/extend-tests/236_extend_with_universal_selector_empty_namespace.hrx
diff --git a/spec/extend-tests/237_extend_with_universal_selector_different_namespace.hrx b/spec/non_conformant/extend-tests/237_extend_with_universal_selector_different_namespace.hrx
similarity index 100%
rename from spec/extend-tests/237_extend_with_universal_selector_different_namespace.hrx
rename to spec/non_conformant/extend-tests/237_extend_with_universal_selector_different_namespace.hrx
diff --git a/spec/extend-tests/238_unify_root_pseudoelement.hrx b/spec/non_conformant/extend-tests/238_unify_root_pseudoelement.hrx
similarity index 100%
rename from spec/extend-tests/238_unify_root_pseudoelement.hrx
rename to spec/non_conformant/extend-tests/238_unify_root_pseudoelement.hrx
diff --git a/spec/extend-tests/compound-unification-in-not.hrx b/spec/non_conformant/extend-tests/compound-unification-in-not.hrx
similarity index 100%
rename from spec/extend-tests/compound-unification-in-not.hrx
rename to spec/non_conformant/extend-tests/compound-unification-in-not.hrx
diff --git a/spec/extend-tests/does_not_move_page_block_in_media.hrx b/spec/non_conformant/extend-tests/does_not_move_page_block_in_media.hrx
similarity index 100%
rename from spec/extend-tests/does_not_move_page_block_in_media.hrx
rename to spec/non_conformant/extend-tests/does_not_move_page_block_in_media.hrx
diff --git a/spec/extend-tests/escaped_selector.hrx b/spec/non_conformant/extend-tests/escaped_selector.hrx
similarity index 100%
rename from spec/extend-tests/escaped_selector.hrx
rename to spec/non_conformant/extend-tests/escaped_selector.hrx
diff --git a/spec/extend-tests/extend-extender.hrx b/spec/non_conformant/extend-tests/extend-extender.hrx
similarity index 100%
rename from spec/extend-tests/extend-extender.hrx
rename to spec/non_conformant/extend-tests/extend-extender.hrx
diff --git a/spec/extend-tests/extend-loop.hrx b/spec/non_conformant/extend-tests/extend-loop.hrx
similarity index 100%
rename from spec/extend-tests/extend-loop.hrx
rename to spec/non_conformant/extend-tests/extend-loop.hrx
diff --git a/spec/extend-tests/extend-result-of-extend.hrx b/spec/non_conformant/extend-tests/extend-result-of-extend.hrx
similarity index 100%
rename from spec/extend-tests/extend-result-of-extend.hrx
rename to spec/non_conformant/extend-tests/extend-result-of-extend.hrx
diff --git a/spec/extend-tests/extend-self.hrx b/spec/non_conformant/extend-tests/extend-self.hrx
similarity index 100%
rename from spec/extend-tests/extend-self.hrx
rename to spec/non_conformant/extend-tests/extend-self.hrx
diff --git a/spec/extend-tests/fake-pseudo-element-order/README.md b/spec/non_conformant/extend-tests/fake-pseudo-element-order/README.md
similarity index 100%
rename from spec/extend-tests/fake-pseudo-element-order/README.md
rename to spec/non_conformant/extend-tests/fake-pseudo-element-order/README.md
diff --git a/spec/extend-tests/fake-pseudo-element-order/after.hrx b/spec/non_conformant/extend-tests/fake-pseudo-element-order/after.hrx
similarity index 100%
rename from spec/extend-tests/fake-pseudo-element-order/after.hrx
rename to spec/non_conformant/extend-tests/fake-pseudo-element-order/after.hrx
diff --git a/spec/extend-tests/fake-pseudo-element-order/before.hrx b/spec/non_conformant/extend-tests/fake-pseudo-element-order/before.hrx
similarity index 100%
rename from spec/extend-tests/fake-pseudo-element-order/before.hrx
rename to spec/non_conformant/extend-tests/fake-pseudo-element-order/before.hrx
diff --git a/spec/extend-tests/fake-pseudo-element-order/first-letter.hrx b/spec/non_conformant/extend-tests/fake-pseudo-element-order/first-letter.hrx
similarity index 100%
rename from spec/extend-tests/fake-pseudo-element-order/first-letter.hrx
rename to spec/non_conformant/extend-tests/fake-pseudo-element-order/first-letter.hrx
diff --git a/spec/extend-tests/fake-pseudo-element-order/first-line.hrx b/spec/non_conformant/extend-tests/fake-pseudo-element-order/first-line.hrx
similarity index 100%
rename from spec/extend-tests/fake-pseudo-element-order/first-line.hrx
rename to spec/non_conformant/extend-tests/fake-pseudo-element-order/first-line.hrx
diff --git a/spec/extend-tests/issue_146.hrx b/spec/non_conformant/extend-tests/issue_146.hrx
similarity index 100%
rename from spec/extend-tests/issue_146.hrx
rename to spec/non_conformant/extend-tests/issue_146.hrx
diff --git a/spec/extend-tests/nested-compound-unification.hrx b/spec/non_conformant/extend-tests/nested-compound-unification.hrx
similarity index 100%
rename from spec/extend-tests/nested-compound-unification.hrx
rename to spec/non_conformant/extend-tests/nested-compound-unification.hrx
diff --git a/spec/extend-tests/not-into-not-not.hrx b/spec/non_conformant/extend-tests/not-into-not-not.hrx
similarity index 100%
rename from spec/extend-tests/not-into-not-not.hrx
rename to spec/non_conformant/extend-tests/not-into-not-not.hrx
diff --git a/spec/extend-tests/selector_list.hrx b/spec/non_conformant/extend-tests/selector_list.hrx
similarity index 100%
rename from spec/extend-tests/selector_list.hrx
rename to spec/non_conformant/extend-tests/selector_list.hrx
diff --git a/spec/extend-tests/subject-operator/200_test_extend_with_subject_transfers_subject_to_extender.hrx b/spec/non_conformant/extend-tests/subject-operator/200_test_extend_with_subject_transfers_subject_to_extender.hrx
similarity index 100%
rename from spec/extend-tests/subject-operator/200_test_extend_with_subject_transfers_subject_to_extender.hrx
rename to spec/non_conformant/extend-tests/subject-operator/200_test_extend_with_subject_transfers_subject_to_extender.hrx
diff --git a/spec/extend-tests/subject-operator/201_test_extend_with_subject_transfers_subject_to_extender.hrx b/spec/non_conformant/extend-tests/subject-operator/201_test_extend_with_subject_transfers_subject_to_extender.hrx
similarity index 100%
rename from spec/extend-tests/subject-operator/201_test_extend_with_subject_transfers_subject_to_extender.hrx
rename to spec/non_conformant/extend-tests/subject-operator/201_test_extend_with_subject_transfers_subject_to_extender.hrx
diff --git a/spec/extend-tests/subject-operator/202_test_extend_with_subject_retains_subject_on_target.hrx b/spec/non_conformant/extend-tests/subject-operator/202_test_extend_with_subject_retains_subject_on_target.hrx
similarity index 100%
rename from spec/extend-tests/subject-operator/202_test_extend_with_subject_retains_subject_on_target.hrx
rename to spec/non_conformant/extend-tests/subject-operator/202_test_extend_with_subject_retains_subject_on_target.hrx
diff --git a/spec/extend-tests/subject-operator/203_test_extend_with_subject_transfers_subject_to_target.hrx b/spec/non_conformant/extend-tests/subject-operator/203_test_extend_with_subject_transfers_subject_to_target.hrx
similarity index 100%
rename from spec/extend-tests/subject-operator/203_test_extend_with_subject_transfers_subject_to_target.hrx
rename to spec/non_conformant/extend-tests/subject-operator/203_test_extend_with_subject_transfers_subject_to_target.hrx
diff --git a/spec/extend-tests/subject-operator/204_test_extend_with_subject_retains_subject_on_extender.hrx b/spec/non_conformant/extend-tests/subject-operator/204_test_extend_with_subject_retains_subject_on_extender.hrx
similarity index 100%
rename from spec/extend-tests/subject-operator/204_test_extend_with_subject_retains_subject_on_extender.hrx
rename to spec/non_conformant/extend-tests/subject-operator/204_test_extend_with_subject_retains_subject_on_extender.hrx
diff --git a/spec/extend-tests/subject-operator/205_test_extend_with_subject_fails_with_conflicting_subject.hrx b/spec/non_conformant/extend-tests/subject-operator/205_test_extend_with_subject_fails_with_conflicting_subject.hrx
similarity index 100%
rename from spec/extend-tests/subject-operator/205_test_extend_with_subject_fails_with_conflicting_subject.hrx
rename to spec/non_conformant/extend-tests/subject-operator/205_test_extend_with_subject_fails_with_conflicting_subject.hrx
diff --git a/spec/extend-tests/subject-operator/notes.txt b/spec/non_conformant/extend-tests/subject-operator/notes.txt
similarity index 100%
rename from spec/extend-tests/subject-operator/notes.txt
rename to spec/non_conformant/extend-tests/subject-operator/notes.txt
diff --git a/spec/media_import.hrx b/spec/non_conformant/media_import.hrx
similarity index 100%
rename from spec/media_import.hrx
rename to spec/non_conformant/media_import.hrx
diff --git a/spec/misc/JMA-pseudo-test.hrx b/spec/non_conformant/misc/JMA-pseudo-test.hrx
similarity index 100%
rename from spec/misc/JMA-pseudo-test.hrx
rename to spec/non_conformant/misc/JMA-pseudo-test.hrx
diff --git a/spec/misc/directive_interpolation.hrx b/spec/non_conformant/misc/directive_interpolation.hrx
similarity index 100%
rename from spec/misc/directive_interpolation.hrx
rename to spec/non_conformant/misc/directive_interpolation.hrx
diff --git a/spec/misc/empty_content.hrx b/spec/non_conformant/misc/empty_content.hrx
similarity index 100%
rename from spec/misc/empty_content.hrx
rename to spec/non_conformant/misc/empty_content.hrx
diff --git a/spec/misc/error-directive.hrx b/spec/non_conformant/misc/error-directive.hrx
similarity index 100%
rename from spec/misc/error-directive.hrx
rename to spec/non_conformant/misc/error-directive.hrx
diff --git a/spec/misc/import_in_mixin.hrx b/spec/non_conformant/misc/import_in_mixin.hrx
similarity index 100%
rename from spec/misc/import_in_mixin.hrx
rename to spec/non_conformant/misc/import_in_mixin.hrx
diff --git a/spec/misc/import_with_interpolation.hrx b/spec/non_conformant/misc/import_with_interpolation.hrx
similarity index 100%
rename from spec/misc/import_with_interpolation.hrx
rename to spec/non_conformant/misc/import_with_interpolation.hrx
diff --git a/spec/misc/lang-bug.hrx b/spec/non_conformant/misc/lang-bug.hrx
similarity index 100%
rename from spec/misc/lang-bug.hrx
rename to spec/non_conformant/misc/lang-bug.hrx
diff --git a/spec/misc/media_interpolation.hrx b/spec/non_conformant/misc/media_interpolation.hrx
similarity index 100%
rename from spec/misc/media_interpolation.hrx
rename to spec/non_conformant/misc/media_interpolation.hrx
diff --git a/spec/misc/mixin_content.hrx b/spec/non_conformant/misc/mixin_content.hrx
similarity index 100%
rename from spec/misc/mixin_content.hrx
rename to spec/non_conformant/misc/mixin_content.hrx
diff --git a/spec/misc/namespace_properties_with_script_value.hrx b/spec/non_conformant/misc/namespace_properties_with_script_value.hrx
similarity index 100%
rename from spec/misc/namespace_properties_with_script_value.hrx
rename to spec/non_conformant/misc/namespace_properties_with_script_value.hrx
diff --git a/spec/misc/negative_numbers.hrx b/spec/non_conformant/misc/negative_numbers.hrx
similarity index 100%
rename from spec/misc/negative_numbers.hrx
rename to spec/non_conformant/misc/negative_numbers.hrx
diff --git a/spec/misc/selector_interpolation_before_element_name.hrx b/spec/non_conformant/misc/selector_interpolation_before_element_name.hrx
similarity index 100%
rename from spec/misc/selector_interpolation_before_element_name.hrx
rename to spec/non_conformant/misc/selector_interpolation_before_element_name.hrx
diff --git a/spec/misc/selector_only_interpolation.hrx b/spec/non_conformant/misc/selector_only_interpolation.hrx
similarity index 100%
rename from spec/misc/selector_only_interpolation.hrx
rename to spec/non_conformant/misc/selector_only_interpolation.hrx
diff --git a/spec/misc/trailing_comma_in_selector.hrx b/spec/non_conformant/misc/trailing_comma_in_selector.hrx
similarity index 100%
rename from spec/misc/trailing_comma_in_selector.hrx
rename to spec/non_conformant/misc/trailing_comma_in_selector.hrx
diff --git a/spec/misc/unicode_variables/input.scss b/spec/non_conformant/misc/unicode_variables/input.scss
similarity index 100%
rename from spec/misc/unicode_variables/input.scss
rename to spec/non_conformant/misc/unicode_variables/input.scss
diff --git a/spec/misc/unicode_variables/output.css b/spec/non_conformant/misc/unicode_variables/output.css
similarity index 100%
rename from spec/misc/unicode_variables/output.css
rename to spec/non_conformant/misc/unicode_variables/output.css
diff --git a/spec/misc/warn-directive.hrx b/spec/non_conformant/misc/warn-directive.hrx
similarity index 100%
rename from spec/misc/warn-directive.hrx
rename to spec/non_conformant/misc/warn-directive.hrx
diff --git a/spec/mixin/content/arguments/error/args.hrx b/spec/non_conformant/mixin/content/arguments/error/args.hrx
similarity index 100%
rename from spec/mixin/content/arguments/error/args.hrx
rename to spec/non_conformant/mixin/content/arguments/error/args.hrx
diff --git a/spec/mixin/content/arguments/error/syntax.hrx b/spec/non_conformant/mixin/content/arguments/error/syntax.hrx
similarity index 100%
rename from spec/mixin/content/arguments/error/syntax.hrx
rename to spec/non_conformant/mixin/content/arguments/error/syntax.hrx
diff --git a/spec/mixin/content/arguments/none.hrx b/spec/non_conformant/mixin/content/arguments/none.hrx
similarity index 100%
rename from spec/mixin/content/arguments/none.hrx
rename to spec/non_conformant/mixin/content/arguments/none.hrx
diff --git a/spec/mixin/content/arguments/passing.hrx b/spec/non_conformant/mixin/content/arguments/passing.hrx
similarity index 100%
rename from spec/mixin/content/arguments/passing.hrx
rename to spec/non_conformant/mixin/content/arguments/passing.hrx
diff --git a/spec/mixin/content/arguments/receiving.hrx b/spec/non_conformant/mixin/content/arguments/receiving.hrx
similarity index 100%
rename from spec/mixin/content/arguments/receiving.hrx
rename to spec/non_conformant/mixin/content/arguments/receiving.hrx
diff --git a/spec/mixin/content/arguments/scope.hrx b/spec/non_conformant/mixin/content/arguments/scope.hrx
similarity index 100%
rename from spec/mixin/content/arguments/scope.hrx
rename to spec/non_conformant/mixin/content/arguments/scope.hrx
diff --git a/spec/mixin/content/arguments/weird_syntax.hrx b/spec/non_conformant/mixin/content/arguments/weird_syntax.hrx
similarity index 100%
rename from spec/mixin/content/arguments/weird_syntax.hrx
rename to spec/non_conformant/mixin/content/arguments/weird_syntax.hrx
diff --git a/spec/mixin/content/before_if.hrx b/spec/non_conformant/mixin/content/before_if.hrx
similarity index 100%
rename from spec/mixin/content/before_if.hrx
rename to spec/non_conformant/mixin/content/before_if.hrx
diff --git a/spec/mixin/content/recursive.hrx b/spec/non_conformant/mixin/content/recursive.hrx
similarity index 100%
rename from spec/mixin/content/recursive.hrx
rename to spec/non_conformant/mixin/content/recursive.hrx
diff --git a/spec/mixin/environment_locality.hrx b/spec/non_conformant/mixin/environment_locality.hrx
similarity index 100%
rename from spec/mixin/environment_locality.hrx
rename to spec/non_conformant/mixin/environment_locality.hrx
diff --git a/spec/mixin/error/no_content.hrx b/spec/non_conformant/mixin/error/no_content.hrx
similarity index 100%
rename from spec/mixin/error/no_content.hrx
rename to spec/non_conformant/mixin/error/no_content.hrx
diff --git a/spec/nesting/not.hrx b/spec/non_conformant/nesting/not.hrx
similarity index 100%
rename from spec/nesting/not.hrx
rename to spec/non_conformant/nesting/not.hrx
diff --git a/spec/nesting/parent_with_newline.hrx b/spec/non_conformant/nesting/parent_with_newline.hrx
similarity index 100%
rename from spec/nesting/parent_with_newline.hrx
rename to spec/non_conformant/nesting/parent_with_newline.hrx
diff --git a/spec/operations/division.hrx b/spec/non_conformant/operations/division.hrx
similarity index 100%
rename from spec/operations/division.hrx
rename to spec/non_conformant/operations/division.hrx
diff --git a/spec/parser/and_and.hrx b/spec/non_conformant/parser/and_and.hrx
similarity index 84%
rename from spec/parser/and_and.hrx
rename to spec/non_conformant/parser/and_and.hrx
index ab720acee7..85293045b4 100644
--- a/spec/parser/and_and.hrx
+++ b/spec/non_conformant/parser/and_and.hrx
@@ -17,5 +17,5 @@ In Sass, "&&" means two copies of the parent selector. You probably want to use
   '
 
 <===> warning-libsass
-WARNING on line 2, column 15 of /sass/spec/parser/and_and/input.scss:
+WARNING on line 2, column 15 of /sass/spec/non_conformant/parser/and_and/input.scss:
 In Sass, "&&" means two copies of the parent selector. You probably want to use "and" instead.
diff --git a/spec/parser/arglists/can-end-with-comma/error-call-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-1.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-call-1.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-call-1.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-call-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-2.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-call-2.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-call-2.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-call-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-call-3.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-call-3.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-call-3.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-function-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-1.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-function-1.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-function-1.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-function-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-2.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-function-2.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-function-2.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-function-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-function-3.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-function-3.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-function-3.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-include-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-1.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-include-1.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-include-1.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-include-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-2.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-include-2.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-include-2.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-include-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-include-3.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-include-3.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-include-3.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-mixin-1.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-1.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-mixin-1.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-1.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-mixin-2.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-2.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-mixin-2.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-2.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/error-mixin-3.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-3.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/error-mixin-3.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/error-mixin-3.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/functions.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/functions.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/functions.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/functions.hrx
diff --git a/spec/parser/arglists/can-end-with-comma/mixins.hrx b/spec/non_conformant/parser/arglists/can-end-with-comma/mixins.hrx
similarity index 100%
rename from spec/parser/arglists/can-end-with-comma/mixins.hrx
rename to spec/non_conformant/parser/arglists/can-end-with-comma/mixins.hrx
diff --git a/spec/parser/interpolate/00_concatenation/spaced.hrx b/spec/non_conformant/parser/interpolate/00_concatenation/spaced.hrx
similarity index 100%
rename from spec/parser/interpolate/00_concatenation/spaced.hrx
rename to spec/non_conformant/parser/interpolate/00_concatenation/spaced.hrx
diff --git a/spec/parser/interpolate/00_concatenation/unspaced.hrx b/spec/non_conformant/parser/interpolate/00_concatenation/unspaced.hrx
similarity index 100%
rename from spec/parser/interpolate/00_concatenation/unspaced.hrx
rename to spec/non_conformant/parser/interpolate/00_concatenation/unspaced.hrx
diff --git a/spec/parser/interpolate/01_literal/01_inline.hrx b/spec/non_conformant/parser/interpolate/01_literal/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/01_literal/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/01_literal/01_inline.hrx
diff --git a/spec/parser/interpolate/01_literal/02_variable.hrx b/spec/non_conformant/parser/interpolate/01_literal/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/01_literal/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/01_literal/02_variable.hrx
diff --git a/spec/parser/interpolate/01_literal/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/01_literal/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/01_literal/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/01_literal/03_inline_double.hrx
diff --git a/spec/parser/interpolate/01_literal/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/01_literal/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/01_literal/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/01_literal/04_variable_double.hrx
diff --git a/spec/parser/interpolate/01_literal/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/01_literal/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/01_literal/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/01_literal/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/01_literal/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/01_literal/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/01_literal/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/01_literal/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/02_double_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/02_double_quoted/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/02_double_quoted/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/02_double_quoted/01_inline.hrx
diff --git a/spec/parser/interpolate/02_double_quoted/02_variable.hrx b/spec/non_conformant/parser/interpolate/02_double_quoted/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/02_double_quoted/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/02_double_quoted/02_variable.hrx
diff --git a/spec/parser/interpolate/02_double_quoted/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/02_double_quoted/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/02_double_quoted/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/02_double_quoted/03_inline_double.hrx
diff --git a/spec/parser/interpolate/02_double_quoted/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/02_double_quoted/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/02_double_quoted/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/02_double_quoted/04_variable_double.hrx
diff --git a/spec/parser/interpolate/02_double_quoted/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/02_double_quoted/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/02_double_quoted/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/02_double_quoted/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/02_double_quoted/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/03_single_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/03_single_quoted/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/03_single_quoted/01_inline.hrx
diff --git a/spec/parser/interpolate/03_single_quoted/02_variable.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/03_single_quoted/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/03_single_quoted/02_variable.hrx
diff --git a/spec/parser/interpolate/03_single_quoted/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/03_single_quoted/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/03_single_quoted/03_inline_double.hrx
diff --git a/spec/parser/interpolate/03_single_quoted/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/03_single_quoted/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/03_single_quoted/04_variable_double.hrx
diff --git a/spec/parser/interpolate/03_single_quoted/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/03_single_quoted/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/03_single_quoted/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/03_single_quoted/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/04_space_list_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/04_space_list_quoted/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/04_space_list_quoted/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/04_space_list_quoted/01_inline.hrx
diff --git a/spec/parser/interpolate/04_space_list_quoted/02_variable.hrx b/spec/non_conformant/parser/interpolate/04_space_list_quoted/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/04_space_list_quoted/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/04_space_list_quoted/02_variable.hrx
diff --git a/spec/parser/interpolate/04_space_list_quoted/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/04_space_list_quoted/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/04_space_list_quoted/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/04_space_list_quoted/03_inline_double.hrx
diff --git a/spec/parser/interpolate/04_space_list_quoted/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/04_space_list_quoted/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/04_space_list_quoted/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/04_space_list_quoted/04_variable_double.hrx
diff --git a/spec/parser/interpolate/04_space_list_quoted/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/04_space_list_quoted/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/04_space_list_quoted/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/04_space_list_quoted/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/04_space_list_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/04_space_list_quoted/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/04_space_list_quoted/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/04_space_list_quoted/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/05_comma_list_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/05_comma_list_quoted/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/05_comma_list_quoted/01_inline.hrx
diff --git a/spec/parser/interpolate/05_comma_list_quoted/02_variable.hrx b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/05_comma_list_quoted/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/05_comma_list_quoted/02_variable.hrx
diff --git a/spec/parser/interpolate/05_comma_list_quoted/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/05_comma_list_quoted/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/05_comma_list_quoted/03_inline_double.hrx
diff --git a/spec/parser/interpolate/05_comma_list_quoted/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/05_comma_list_quoted/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/05_comma_list_quoted/04_variable_double.hrx
diff --git a/spec/parser/interpolate/05_comma_list_quoted/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/05_comma_list_quoted/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/05_comma_list_quoted/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/05_comma_list_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/05_comma_list_quoted/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/05_comma_list_quoted/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/05_comma_list_quoted/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/06_space_list_complex/01_inline.hrx b/spec/non_conformant/parser/interpolate/06_space_list_complex/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/06_space_list_complex/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/06_space_list_complex/01_inline.hrx
diff --git a/spec/parser/interpolate/06_space_list_complex/02_variable.hrx b/spec/non_conformant/parser/interpolate/06_space_list_complex/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/06_space_list_complex/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/06_space_list_complex/02_variable.hrx
diff --git a/spec/parser/interpolate/06_space_list_complex/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/06_space_list_complex/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/06_space_list_complex/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/06_space_list_complex/03_inline_double.hrx
diff --git a/spec/parser/interpolate/06_space_list_complex/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/06_space_list_complex/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/06_space_list_complex/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/06_space_list_complex/04_variable_double.hrx
diff --git a/spec/parser/interpolate/06_space_list_complex/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/06_space_list_complex/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/06_space_list_complex/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/06_space_list_complex/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/06_space_list_complex/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/06_space_list_complex/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/06_space_list_complex/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/06_space_list_complex/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/07_comma_list_complex/01_inline.hrx b/spec/non_conformant/parser/interpolate/07_comma_list_complex/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/07_comma_list_complex/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/07_comma_list_complex/01_inline.hrx
diff --git a/spec/parser/interpolate/07_comma_list_complex/02_variable.hrx b/spec/non_conformant/parser/interpolate/07_comma_list_complex/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/07_comma_list_complex/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/07_comma_list_complex/02_variable.hrx
diff --git a/spec/parser/interpolate/07_comma_list_complex/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/07_comma_list_complex/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/07_comma_list_complex/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/07_comma_list_complex/03_inline_double.hrx
diff --git a/spec/parser/interpolate/07_comma_list_complex/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/07_comma_list_complex/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/07_comma_list_complex/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/07_comma_list_complex/04_variable_double.hrx
diff --git a/spec/parser/interpolate/07_comma_list_complex/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/07_comma_list_complex/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/07_comma_list_complex/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/07_comma_list_complex/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/07_comma_list_complex/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/07_comma_list_complex/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/07_comma_list_complex/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/07_comma_list_complex/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/10_escaped_backslash/01_inline.hrx b/spec/non_conformant/parser/interpolate/10_escaped_backslash/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/10_escaped_backslash/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/10_escaped_backslash/01_inline.hrx
diff --git a/spec/parser/interpolate/10_escaped_backslash/02_variable.hrx b/spec/non_conformant/parser/interpolate/10_escaped_backslash/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/10_escaped_backslash/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/10_escaped_backslash/02_variable.hrx
diff --git a/spec/parser/interpolate/10_escaped_backslash/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/10_escaped_backslash/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/10_escaped_backslash/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/10_escaped_backslash/03_inline_double.hrx
diff --git a/spec/parser/interpolate/10_escaped_backslash/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/10_escaped_backslash/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/10_escaped_backslash/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/10_escaped_backslash/04_variable_double.hrx
diff --git a/spec/parser/interpolate/10_escaped_backslash/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/10_escaped_backslash/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/10_escaped_backslash/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/10_escaped_backslash/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/10_escaped_backslash/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/11_escaped_literal/01_inline.hrx b/spec/non_conformant/parser/interpolate/11_escaped_literal/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/11_escaped_literal/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/11_escaped_literal/01_inline.hrx
diff --git a/spec/parser/interpolate/11_escaped_literal/02_variable.hrx b/spec/non_conformant/parser/interpolate/11_escaped_literal/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/11_escaped_literal/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/11_escaped_literal/02_variable.hrx
diff --git a/spec/parser/interpolate/11_escaped_literal/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/11_escaped_literal/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/11_escaped_literal/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/11_escaped_literal/03_inline_double.hrx
diff --git a/spec/parser/interpolate/11_escaped_literal/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/11_escaped_literal/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/11_escaped_literal/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/11_escaped_literal/04_variable_double.hrx
diff --git a/spec/parser/interpolate/11_escaped_literal/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/11_escaped_literal/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/11_escaped_literal/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/11_escaped_literal/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/11_escaped_literal/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/12_escaped_double_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/12_escaped_double_quoted/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/12_escaped_double_quoted/01_inline.hrx
diff --git a/spec/parser/interpolate/12_escaped_double_quoted/02_variable.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/12_escaped_double_quoted/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/12_escaped_double_quoted/02_variable.hrx
diff --git a/spec/parser/interpolate/12_escaped_double_quoted/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/12_escaped_double_quoted/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/12_escaped_double_quoted/03_inline_double.hrx
diff --git a/spec/parser/interpolate/12_escaped_double_quoted/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/12_escaped_double_quoted/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/12_escaped_double_quoted/04_variable_double.hrx
diff --git a/spec/parser/interpolate/12_escaped_double_quoted/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/12_escaped_double_quoted/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/12_escaped_double_quoted/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/12_escaped_double_quoted/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/13_escaped_single_quoted/01_inline.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/13_escaped_single_quoted/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/13_escaped_single_quoted/01_inline.hrx
diff --git a/spec/parser/interpolate/13_escaped_single_quoted/02_variable.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/13_escaped_single_quoted/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/13_escaped_single_quoted/02_variable.hrx
diff --git a/spec/parser/interpolate/13_escaped_single_quoted/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/13_escaped_single_quoted/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/13_escaped_single_quoted/03_inline_double.hrx
diff --git a/spec/parser/interpolate/13_escaped_single_quoted/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/13_escaped_single_quoted/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/13_escaped_single_quoted/04_variable_double.hrx
diff --git a/spec/parser/interpolate/13_escaped_single_quoted/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/13_escaped_single_quoted/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/13_escaped_single_quoted/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/13_escaped_single_quoted/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/14_escapes_literal_numbers/01_inline.hrx b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/14_escapes_literal_numbers/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/01_inline.hrx
diff --git a/spec/parser/interpolate/14_escapes_literal_numbers/02_variable.hrx b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/14_escapes_literal_numbers/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/02_variable.hrx
diff --git a/spec/parser/interpolate/14_escapes_literal_numbers/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/14_escapes_literal_numbers/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/03_inline_double.hrx
diff --git a/spec/parser/interpolate/14_escapes_literal_numbers/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/14_escapes_literal_numbers/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/04_variable_double.hrx
diff --git a/spec/parser/interpolate/14_escapes_literal_numbers/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/14_escapes_literal_numbers/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/14_escapes_literal_numbers/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/01_inline.hrx
diff --git a/spec/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/02_variable.hrx
diff --git a/spec/parser/interpolate/15_escapes_double_quoted_numbers/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/15_escapes_double_quoted_numbers/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/03_inline_double.hrx
diff --git a/spec/parser/interpolate/15_escapes_double_quoted_numbers/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/15_escapes_double_quoted_numbers/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/04_variable_double.hrx
diff --git a/spec/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/15_escapes_double_quoted_numbers/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/01_inline.hrx
diff --git a/spec/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/02_variable.hrx
diff --git a/spec/parser/interpolate/16_escapes_single_quoted_numbers/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/16_escapes_single_quoted_numbers/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/03_inline_double.hrx
diff --git a/spec/parser/interpolate/16_escapes_single_quoted_numbers/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/16_escapes_single_quoted_numbers/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/04_variable_double.hrx
diff --git a/spec/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/16_escapes_single_quoted_numbers/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/17_escapes_literal_lowercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/17_escapes_literal_lowercase/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/01_inline.hrx
diff --git a/spec/parser/interpolate/17_escapes_literal_lowercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/17_escapes_literal_lowercase/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/02_variable.hrx
diff --git a/spec/parser/interpolate/17_escapes_literal_lowercase/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/17_escapes_literal_lowercase/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/03_inline_double.hrx
diff --git a/spec/parser/interpolate/17_escapes_literal_lowercase/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/17_escapes_literal_lowercase/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/04_variable_double.hrx
diff --git a/spec/parser/interpolate/17_escapes_literal_lowercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/17_escapes_literal_lowercase/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/17_escapes_literal_lowercase/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/01_inline.hrx
diff --git a/spec/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/02_variable.hrx
diff --git a/spec/parser/interpolate/18_escapes_double_quoted_lowercase/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/18_escapes_double_quoted_lowercase/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/03_inline_double.hrx
diff --git a/spec/parser/interpolate/18_escapes_double_quoted_lowercase/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/18_escapes_double_quoted_lowercase/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/04_variable_double.hrx
diff --git a/spec/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/18_escapes_double_quoted_lowercase/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/01_inline.hrx
diff --git a/spec/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/02_variable.hrx
diff --git a/spec/parser/interpolate/19_escapes_single_quoted_lowercase/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/19_escapes_single_quoted_lowercase/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/03_inline_double.hrx
diff --git a/spec/parser/interpolate/19_escapes_single_quoted_lowercase/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/19_escapes_single_quoted_lowercase/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/04_variable_double.hrx
diff --git a/spec/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/19_escapes_single_quoted_lowercase/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/20_escapes_literal_uppercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/20_escapes_literal_uppercase/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/01_inline.hrx
diff --git a/spec/parser/interpolate/20_escapes_literal_uppercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/20_escapes_literal_uppercase/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/02_variable.hrx
diff --git a/spec/parser/interpolate/20_escapes_literal_uppercase/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/20_escapes_literal_uppercase/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/03_inline_double.hrx
diff --git a/spec/parser/interpolate/20_escapes_literal_uppercase/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/20_escapes_literal_uppercase/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/04_variable_double.hrx
diff --git a/spec/parser/interpolate/20_escapes_literal_uppercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/20_escapes_literal_uppercase/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/20_escapes_literal_uppercase/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/01_inline.hrx
diff --git a/spec/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/02_variable.hrx
diff --git a/spec/parser/interpolate/21_escapes_double_quoted_uppercase/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/21_escapes_double_quoted_uppercase/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/03_inline_double.hrx
diff --git a/spec/parser/interpolate/21_escapes_double_quoted_uppercase/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/21_escapes_double_quoted_uppercase/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/04_variable_double.hrx
diff --git a/spec/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/21_escapes_double_quoted_uppercase/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/01_inline.hrx
diff --git a/spec/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/02_variable.hrx
diff --git a/spec/parser/interpolate/22_escapes_single_quoted_uppercase/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/22_escapes_single_quoted_uppercase/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/03_inline_double.hrx
diff --git a/spec/parser/interpolate/22_escapes_single_quoted_uppercase/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/22_escapes_single_quoted_uppercase/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/04_variable_double.hrx
diff --git a/spec/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/22_escapes_single_quoted_uppercase/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/01_inline.hrx b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/01_inline.hrx
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/02_variable.hrx b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/02_variable.hrx
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/03_inline_double.hrx
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/04_variable_double.hrx
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/input.scss b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/input.scss
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/input.scss
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/input.scss
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-dart-sass.css b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-dart-sass.css
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output-dart-sass.css
diff --git a/spec/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css b/spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css
similarity index 100%
rename from spec/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css
rename to spec/non_conformant/parser/interpolate/23_escapes_literal_specials/06_escape_interpolation/output.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/01_inline/input.scss b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/input.scss
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/01_inline/input.scss
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/input.scss
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-dart-sass.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-dart-sass.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output-dart-sass.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/01_inline/output.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/02_variable/input.scss b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/02_variable/input.scss
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/02_variable/input.scss
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/02_variable/input.scss
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/02_variable/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/02_variable/output.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/02_variable/output.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/02_variable/output.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/input.scss b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/input.scss
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/input.scss
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/input.scss
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/output.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/output.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/03_inline_double/output.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/input.scss b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/input.scss
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/input.scss
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/input.scss
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/output.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/output.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/04_variable_double/output.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/input.scss b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/input.scss
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/input.scss
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/input.scss
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/options.yml b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/options.yml
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/options.yml
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/options.yml
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-dart-sass.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-dart-sass.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output-dart-sass.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/06_escape_interpolation/output.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/input.scss b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/input.scss
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/input.scss
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/input.scss
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/output.css b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/output.css
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/output.css
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/output.css
diff --git a/spec/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/todo.txt b/spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/todo.txt
similarity index 100%
rename from spec/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/todo.txt
rename to spec/non_conformant/parser/interpolate/24_escapes_double_quoted_specials/todo_05_variable_quoted_double/todo.txt
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/01_inline/input.scss b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/input.scss
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/01_inline/input.scss
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/input.scss
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-dart-sass.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-dart-sass.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output-dart-sass.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/01_inline/output.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/02_variable/input.scss b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/02_variable/input.scss
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/02_variable/input.scss
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/02_variable/input.scss
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/02_variable/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/02_variable/output.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/02_variable/output.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/02_variable/output.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/input.scss b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/input.scss
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/input.scss
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/input.scss
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/output.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/output.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/03_inline_double/output.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/input.scss b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/input.scss
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/input.scss
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/input.scss
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/output.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/output.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/04_variable_double/output.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/input.scss b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/input.scss
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/input.scss
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/input.scss
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/options.yml b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/options.yml
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/options.yml
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/options.yml
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-dart-sass.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-dart-sass.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-dart-sass.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output-dart-sass.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/06_escape_interpolation/output.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/input.scss b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/input.scss
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/input.scss
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/input.scss
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/output.css b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/output.css
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/output.css
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/output.css
diff --git a/spec/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/todo.txt b/spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/todo.txt
similarity index 100%
rename from spec/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/todo.txt
rename to spec/non_conformant/parser/interpolate/25_escapes_single_quoted_specials/todo_05_variable_quoted_double/todo.txt
diff --git a/spec/parser/interpolate/26_escaped_literal_quotes/01_inline.hrx b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/26_escaped_literal_quotes/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/01_inline.hrx
diff --git a/spec/parser/interpolate/26_escaped_literal_quotes/02_variable.hrx b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/26_escaped_literal_quotes/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/02_variable.hrx
diff --git a/spec/parser/interpolate/26_escaped_literal_quotes/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/26_escaped_literal_quotes/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/03_inline_double.hrx
diff --git a/spec/parser/interpolate/26_escaped_literal_quotes/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/26_escaped_literal_quotes/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/04_variable_double.hrx
diff --git a/spec/parser/interpolate/26_escaped_literal_quotes/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/26_escaped_literal_quotes/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/26_escaped_literal_quotes/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/27_escaped_double_quotes/01_inline.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/27_escaped_double_quotes/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/27_escaped_double_quotes/01_inline.hrx
diff --git a/spec/parser/interpolate/27_escaped_double_quotes/02_variable.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/27_escaped_double_quotes/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/27_escaped_double_quotes/02_variable.hrx
diff --git a/spec/parser/interpolate/27_escaped_double_quotes/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/27_escaped_double_quotes/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/27_escaped_double_quotes/03_inline_double.hrx
diff --git a/spec/parser/interpolate/27_escaped_double_quotes/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/27_escaped_double_quotes/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/27_escaped_double_quotes/04_variable_double.hrx
diff --git a/spec/parser/interpolate/27_escaped_double_quotes/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/27_escaped_double_quotes/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/27_escaped_double_quotes/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/27_escaped_double_quotes/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/28_escaped_single_quotes/01_inline.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/28_escaped_single_quotes/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/28_escaped_single_quotes/01_inline.hrx
diff --git a/spec/parser/interpolate/28_escaped_single_quotes/02_variable.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/28_escaped_single_quotes/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/28_escaped_single_quotes/02_variable.hrx
diff --git a/spec/parser/interpolate/28_escaped_single_quotes/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/28_escaped_single_quotes/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/28_escaped_single_quotes/03_inline_double.hrx
diff --git a/spec/parser/interpolate/28_escaped_single_quotes/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/28_escaped_single_quotes/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/28_escaped_single_quotes/04_variable_double.hrx
diff --git a/spec/parser/interpolate/28_escaped_single_quotes/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/28_escaped_single_quotes/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/28_escaped_single_quotes/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/28_escaped_single_quotes/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/29_binary_operation/01_inline.hrx b/spec/non_conformant/parser/interpolate/29_binary_operation/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/29_binary_operation/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/29_binary_operation/01_inline.hrx
diff --git a/spec/parser/interpolate/29_binary_operation/02_variable.hrx b/spec/non_conformant/parser/interpolate/29_binary_operation/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/29_binary_operation/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/29_binary_operation/02_variable.hrx
diff --git a/spec/parser/interpolate/29_binary_operation/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/29_binary_operation/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/29_binary_operation/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/29_binary_operation/03_inline_double.hrx
diff --git a/spec/parser/interpolate/29_binary_operation/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/29_binary_operation/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/29_binary_operation/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/29_binary_operation/04_variable_double.hrx
diff --git a/spec/parser/interpolate/29_binary_operation/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/29_binary_operation/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/29_binary_operation/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/29_binary_operation/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/29_binary_operation/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/29_binary_operation/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/29_binary_operation/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/29_binary_operation/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/30_base_test/01_inline.hrx b/spec/non_conformant/parser/interpolate/30_base_test/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/30_base_test/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/30_base_test/01_inline.hrx
diff --git a/spec/parser/interpolate/30_base_test/02_variable.hrx b/spec/non_conformant/parser/interpolate/30_base_test/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/30_base_test/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/30_base_test/02_variable.hrx
diff --git a/spec/parser/interpolate/30_base_test/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/30_base_test/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/30_base_test/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/30_base_test/03_inline_double.hrx
diff --git a/spec/parser/interpolate/30_base_test/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/30_base_test/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/30_base_test/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/30_base_test/04_variable_double.hrx
diff --git a/spec/parser/interpolate/30_base_test/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/30_base_test/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/30_base_test/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/30_base_test/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/30_base_test/06_escape_interpolation.hrx b/spec/non_conformant/parser/interpolate/30_base_test/06_escape_interpolation.hrx
similarity index 100%
rename from spec/parser/interpolate/30_base_test/06_escape_interpolation.hrx
rename to spec/non_conformant/parser/interpolate/30_base_test/06_escape_interpolation.hrx
diff --git a/spec/parser/interpolate/31_schema_simple/01_inline.hrx b/spec/non_conformant/parser/interpolate/31_schema_simple/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/31_schema_simple/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/31_schema_simple/01_inline.hrx
diff --git a/spec/parser/interpolate/31_schema_simple/02_variable.hrx b/spec/non_conformant/parser/interpolate/31_schema_simple/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/31_schema_simple/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/31_schema_simple/02_variable.hrx
diff --git a/spec/parser/interpolate/31_schema_simple/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/31_schema_simple/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/31_schema_simple/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/31_schema_simple/03_inline_double.hrx
diff --git a/spec/parser/interpolate/31_schema_simple/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/31_schema_simple/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/31_schema_simple/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/31_schema_simple/04_variable_double.hrx
diff --git a/spec/parser/interpolate/31_schema_simple/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/31_schema_simple/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/31_schema_simple/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/31_schema_simple/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/32_comma_list/01_inline.hrx b/spec/non_conformant/parser/interpolate/32_comma_list/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/32_comma_list/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/32_comma_list/01_inline.hrx
diff --git a/spec/parser/interpolate/32_comma_list/02_variable.hrx b/spec/non_conformant/parser/interpolate/32_comma_list/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/32_comma_list/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/32_comma_list/02_variable.hrx
diff --git a/spec/parser/interpolate/32_comma_list/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/32_comma_list/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/32_comma_list/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/32_comma_list/03_inline_double.hrx
diff --git a/spec/parser/interpolate/32_comma_list/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/32_comma_list/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/32_comma_list/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/32_comma_list/04_variable_double.hrx
diff --git a/spec/parser/interpolate/32_comma_list/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/32_comma_list/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/32_comma_list/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/32_comma_list/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/33_space_list/01_inline.hrx b/spec/non_conformant/parser/interpolate/33_space_list/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/33_space_list/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/33_space_list/01_inline.hrx
diff --git a/spec/parser/interpolate/33_space_list/02_variable.hrx b/spec/non_conformant/parser/interpolate/33_space_list/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/33_space_list/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/33_space_list/02_variable.hrx
diff --git a/spec/parser/interpolate/33_space_list/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/33_space_list/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/33_space_list/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/33_space_list/03_inline_double.hrx
diff --git a/spec/parser/interpolate/33_space_list/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/33_space_list/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/33_space_list/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/33_space_list/04_variable_double.hrx
diff --git a/spec/parser/interpolate/33_space_list/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/33_space_list/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/33_space_list/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/33_space_list/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/34_mixed_list/01_inline.hrx b/spec/non_conformant/parser/interpolate/34_mixed_list/01_inline.hrx
similarity index 100%
rename from spec/parser/interpolate/34_mixed_list/01_inline.hrx
rename to spec/non_conformant/parser/interpolate/34_mixed_list/01_inline.hrx
diff --git a/spec/parser/interpolate/34_mixed_list/02_variable.hrx b/spec/non_conformant/parser/interpolate/34_mixed_list/02_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/34_mixed_list/02_variable.hrx
rename to spec/non_conformant/parser/interpolate/34_mixed_list/02_variable.hrx
diff --git a/spec/parser/interpolate/34_mixed_list/03_inline_double.hrx b/spec/non_conformant/parser/interpolate/34_mixed_list/03_inline_double.hrx
similarity index 100%
rename from spec/parser/interpolate/34_mixed_list/03_inline_double.hrx
rename to spec/non_conformant/parser/interpolate/34_mixed_list/03_inline_double.hrx
diff --git a/spec/parser/interpolate/34_mixed_list/04_variable_double.hrx b/spec/non_conformant/parser/interpolate/34_mixed_list/04_variable_double.hrx
similarity index 100%
rename from spec/parser/interpolate/34_mixed_list/04_variable_double.hrx
rename to spec/non_conformant/parser/interpolate/34_mixed_list/04_variable_double.hrx
diff --git a/spec/parser/interpolate/34_mixed_list/05_variable_quoted_double.hrx b/spec/non_conformant/parser/interpolate/34_mixed_list/05_variable_quoted_double.hrx
similarity index 100%
rename from spec/parser/interpolate/34_mixed_list/05_variable_quoted_double.hrx
rename to spec/non_conformant/parser/interpolate/34_mixed_list/05_variable_quoted_double.hrx
diff --git a/spec/parser/interpolate/44_selector/colon_twice_todo.hrx b/spec/non_conformant/parser/interpolate/44_selector/colon_twice_todo.hrx
similarity index 100%
rename from spec/parser/interpolate/44_selector/colon_twice_todo.hrx
rename to spec/non_conformant/parser/interpolate/44_selector/colon_twice_todo.hrx
diff --git a/spec/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx b/spec/non_conformant/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx
similarity index 100%
rename from spec/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx
rename to spec/non_conformant/parser/interpolate/44_selector/double_escape/12_double_escaped_interpolated_value_todo.hrx
diff --git a/spec/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx b/spec/non_conformant/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx
rename to spec/non_conformant/parser/interpolate/44_selector/double_escape/22_double_escaped_interpolated_variable.hrx
diff --git a/spec/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx b/spec/non_conformant/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx
similarity index 100%
rename from spec/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx
rename to spec/non_conformant/parser/interpolate/44_selector/double_escape/32_double_escaped_literal.hrx
diff --git a/spec/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx
similarity index 100%
rename from spec/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx
rename to spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/11_escaped_interpolated_value.hrx
diff --git a/spec/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx
similarity index 100%
rename from spec/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx
rename to spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/21_escaped_interpolated_variable.hrx
diff --git a/spec/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx b/spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx
similarity index 100%
rename from spec/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx
rename to spec/non_conformant/parser/interpolate/44_selector/todo_single_escape/31_escaped_literal.hrx
diff --git a/spec/parser/interpolate/interpolate.pl b/spec/non_conformant/parser/interpolate/interpolate.pl
similarity index 100%
rename from spec/parser/interpolate/interpolate.pl
rename to spec/non_conformant/parser/interpolate/interpolate.pl
diff --git a/spec/parser/malformed_expressions/at-debug/incomplete-expression.hrx b/spec/non_conformant/parser/malformed_expressions/at-debug/incomplete-expression.hrx
similarity index 100%
rename from spec/parser/malformed_expressions/at-debug/incomplete-expression.hrx
rename to spec/non_conformant/parser/malformed_expressions/at-debug/incomplete-expression.hrx
diff --git a/spec/parser/malformed_expressions/at-debug/no-argument.hrx b/spec/non_conformant/parser/malformed_expressions/at-debug/no-argument.hrx
similarity index 100%
rename from spec/parser/malformed_expressions/at-debug/no-argument.hrx
rename to spec/non_conformant/parser/malformed_expressions/at-debug/no-argument.hrx
diff --git a/spec/parser/malformed_expressions/at-error/incomplete-expression.hrx b/spec/non_conformant/parser/malformed_expressions/at-error/incomplete-expression.hrx
similarity index 100%
rename from spec/parser/malformed_expressions/at-error/incomplete-expression.hrx
rename to spec/non_conformant/parser/malformed_expressions/at-error/incomplete-expression.hrx
diff --git a/spec/parser/malformed_expressions/at-error/no-argument.hrx b/spec/non_conformant/parser/malformed_expressions/at-error/no-argument.hrx
similarity index 100%
rename from spec/parser/malformed_expressions/at-error/no-argument.hrx
rename to spec/non_conformant/parser/malformed_expressions/at-error/no-argument.hrx
diff --git a/spec/parser/malformed_expressions/at-warn/incomplete-expression.hrx b/spec/non_conformant/parser/malformed_expressions/at-warn/incomplete-expression.hrx
similarity index 100%
rename from spec/parser/malformed_expressions/at-warn/incomplete-expression.hrx
rename to spec/non_conformant/parser/malformed_expressions/at-warn/incomplete-expression.hrx
diff --git a/spec/parser/malformed_expressions/at-warn/no-argument.hrx b/spec/non_conformant/parser/malformed_expressions/at-warn/no-argument.hrx
similarity index 100%
rename from spec/parser/malformed_expressions/at-warn/no-argument.hrx
rename to spec/non_conformant/parser/malformed_expressions/at-warn/no-argument.hrx
diff --git a/spec/parser/malformed_expressions/options.yml b/spec/non_conformant/parser/malformed_expressions/options.yml
similarity index 100%
rename from spec/parser/malformed_expressions/options.yml
rename to spec/non_conformant/parser/malformed_expressions/options.yml
diff --git a/spec/parser/operations/addition/dimensions/pairs.hrx b/spec/non_conformant/parser/operations/addition/dimensions/pairs.hrx
similarity index 100%
rename from spec/parser/operations/addition/dimensions/pairs.hrx
rename to spec/non_conformant/parser/operations/addition/dimensions/pairs.hrx
diff --git a/spec/parser/operations/addition/numbers/pairs.hrx b/spec/non_conformant/parser/operations/addition/numbers/pairs.hrx
similarity index 100%
rename from spec/parser/operations/addition/numbers/pairs.hrx
rename to spec/non_conformant/parser/operations/addition/numbers/pairs.hrx
diff --git a/spec/parser/operations/addition/strings/pairs.hrx b/spec/non_conformant/parser/operations/addition/strings/pairs.hrx
similarity index 100%
rename from spec/parser/operations/addition/strings/pairs.hrx
rename to spec/non_conformant/parser/operations/addition/strings/pairs.hrx
diff --git a/spec/parser/operations/binary-and-unary.hrx b/spec/non_conformant/parser/operations/binary-and-unary.hrx
similarity index 100%
rename from spec/parser/operations/binary-and-unary.hrx
rename to spec/non_conformant/parser/operations/binary-and-unary.hrx
diff --git a/spec/parser/operations/division/dimensions/pairs.hrx b/spec/non_conformant/parser/operations/division/dimensions/pairs.hrx
similarity index 100%
rename from spec/parser/operations/division/dimensions/pairs.hrx
rename to spec/non_conformant/parser/operations/division/dimensions/pairs.hrx
diff --git a/spec/parser/operations/division/mixed/pairs.hrx b/spec/non_conformant/parser/operations/division/mixed/pairs.hrx
similarity index 100%
rename from spec/parser/operations/division/mixed/pairs.hrx
rename to spec/non_conformant/parser/operations/division/mixed/pairs.hrx
diff --git a/spec/parser/operations/division/numbers/pairs.hrx b/spec/non_conformant/parser/operations/division/numbers/pairs.hrx
similarity index 100%
rename from spec/parser/operations/division/numbers/pairs.hrx
rename to spec/non_conformant/parser/operations/division/numbers/pairs.hrx
diff --git a/spec/parser/operations/division/strings/pairs.hrx b/spec/non_conformant/parser/operations/division/strings/pairs.hrx
similarity index 100%
rename from spec/parser/operations/division/strings/pairs.hrx
rename to spec/non_conformant/parser/operations/division/strings/pairs.hrx
diff --git a/spec/parser/operations/logic_eq/dimensions/pairs.hrx b/spec/non_conformant/parser/operations/logic_eq/dimensions/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_eq/dimensions/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_eq/dimensions/pairs.hrx
diff --git a/spec/parser/operations/logic_eq/mixed/pairs.hrx b/spec/non_conformant/parser/operations/logic_eq/mixed/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_eq/mixed/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_eq/mixed/pairs.hrx
diff --git a/spec/parser/operations/logic_eq/numbers/pairs.hrx b/spec/non_conformant/parser/operations/logic_eq/numbers/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_eq/numbers/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_eq/numbers/pairs.hrx
diff --git a/spec/parser/operations/logic_eq/strings/pairs.hrx b/spec/non_conformant/parser/operations/logic_eq/strings/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_eq/strings/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_eq/strings/pairs.hrx
diff --git a/spec/parser/operations/logic_ne/dimensions/pairs.hrx b/spec/non_conformant/parser/operations/logic_ne/dimensions/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_ne/dimensions/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_ne/dimensions/pairs.hrx
diff --git a/spec/parser/operations/logic_ne/mixed/pairs.hrx b/spec/non_conformant/parser/operations/logic_ne/mixed/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_ne/mixed/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_ne/mixed/pairs.hrx
diff --git a/spec/parser/operations/logic_ne/numbers/pairs.hrx b/spec/non_conformant/parser/operations/logic_ne/numbers/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_ne/numbers/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_ne/numbers/pairs.hrx
diff --git a/spec/parser/operations/logic_ne/strings/pairs.hrx b/spec/non_conformant/parser/operations/logic_ne/strings/pairs.hrx
similarity index 100%
rename from spec/parser/operations/logic_ne/strings/pairs.hrx
rename to spec/non_conformant/parser/operations/logic_ne/strings/pairs.hrx
diff --git a/spec/parser/operations/operations.pl b/spec/non_conformant/parser/operations/operations.pl
similarity index 100%
rename from spec/parser/operations/operations.pl
rename to spec/non_conformant/parser/operations/operations.pl
diff --git a/spec/parser/operations/subtract/dimensions/pairs.hrx b/spec/non_conformant/parser/operations/subtract/dimensions/pairs.hrx
similarity index 100%
rename from spec/parser/operations/subtract/dimensions/pairs.hrx
rename to spec/non_conformant/parser/operations/subtract/dimensions/pairs.hrx
diff --git a/spec/parser/operations/subtract/numbers/pairs.hrx b/spec/non_conformant/parser/operations/subtract/numbers/pairs.hrx
similarity index 100%
rename from spec/parser/operations/subtract/numbers/pairs.hrx
rename to spec/non_conformant/parser/operations/subtract/numbers/pairs.hrx
diff --git a/spec/parser/operations/subtract/strings/pairs.hrx b/spec/non_conformant/parser/operations/subtract/strings/pairs.hrx
similarity index 100%
rename from spec/parser/operations/subtract/strings/pairs.hrx
rename to spec/non_conformant/parser/operations/subtract/strings/pairs.hrx
diff --git a/spec/sass/basic.hrx b/spec/non_conformant/sass/basic.hrx
similarity index 100%
rename from spec/sass/basic.hrx
rename to spec/non_conformant/sass/basic.hrx
diff --git a/spec/sass/comment/loud.hrx b/spec/non_conformant/sass/comment/loud.hrx
similarity index 100%
rename from spec/sass/comment/loud.hrx
rename to spec/non_conformant/sass/comment/loud.hrx
diff --git a/spec/sass/extend.hrx b/spec/non_conformant/sass/extend.hrx
similarity index 100%
rename from spec/sass/extend.hrx
rename to spec/non_conformant/sass/extend.hrx
diff --git a/spec/sass/functions.hrx b/spec/non_conformant/sass/functions.hrx
similarity index 100%
rename from spec/sass/functions.hrx
rename to spec/non_conformant/sass/functions.hrx
diff --git a/spec/sass/import/unquoted.hrx b/spec/non_conformant/sass/import/unquoted.hrx
similarity index 100%
rename from spec/sass/import/unquoted.hrx
rename to spec/non_conformant/sass/import/unquoted.hrx
diff --git a/spec/sass/imported.hrx b/spec/non_conformant/sass/imported.hrx
similarity index 100%
rename from spec/sass/imported.hrx
rename to spec/non_conformant/sass/imported.hrx
diff --git a/spec/sass/indentation.hrx b/spec/non_conformant/sass/indentation.hrx
similarity index 100%
rename from spec/sass/indentation.hrx
rename to spec/non_conformant/sass/indentation.hrx
diff --git a/spec/sass/mixins.hrx b/spec/non_conformant/sass/mixins.hrx
similarity index 100%
rename from spec/sass/mixins.hrx
rename to spec/non_conformant/sass/mixins.hrx
diff --git a/spec/sass/pseudo.hrx b/spec/non_conformant/sass/pseudo.hrx
similarity index 100%
rename from spec/sass/pseudo.hrx
rename to spec/non_conformant/sass/pseudo.hrx
diff --git a/spec/sass/selectors.hrx b/spec/non_conformant/sass/selectors.hrx
similarity index 100%
rename from spec/sass/selectors.hrx
rename to spec/non_conformant/sass/selectors.hrx
diff --git a/spec/sass/semicolon/at_rule.hrx b/spec/non_conformant/sass/semicolon/at_rule.hrx
similarity index 100%
rename from spec/sass/semicolon/at_rule.hrx
rename to spec/non_conformant/sass/semicolon/at_rule.hrx
diff --git a/spec/sass/semicolon/content.hrx b/spec/non_conformant/sass/semicolon/content.hrx
similarity index 100%
rename from spec/sass/semicolon/content.hrx
rename to spec/non_conformant/sass/semicolon/content.hrx
diff --git a/spec/sass/semicolon/debug.hrx b/spec/non_conformant/sass/semicolon/debug.hrx
similarity index 100%
rename from spec/sass/semicolon/debug.hrx
rename to spec/non_conformant/sass/semicolon/debug.hrx
diff --git a/spec/sass/semicolon/declaration.hrx b/spec/non_conformant/sass/semicolon/declaration.hrx
similarity index 100%
rename from spec/sass/semicolon/declaration.hrx
rename to spec/non_conformant/sass/semicolon/declaration.hrx
diff --git a/spec/sass/semicolon/error.hrx b/spec/non_conformant/sass/semicolon/error.hrx
similarity index 100%
rename from spec/sass/semicolon/error.hrx
rename to spec/non_conformant/sass/semicolon/error.hrx
diff --git a/spec/sass/semicolon/import.hrx b/spec/non_conformant/sass/semicolon/import.hrx
similarity index 100%
rename from spec/sass/semicolon/import.hrx
rename to spec/non_conformant/sass/semicolon/import.hrx
diff --git a/spec/sass/semicolon/include.hrx b/spec/non_conformant/sass/semicolon/include.hrx
similarity index 100%
rename from spec/sass/semicolon/include.hrx
rename to spec/non_conformant/sass/semicolon/include.hrx
diff --git a/spec/sass/semicolon/options.yml b/spec/non_conformant/sass/semicolon/options.yml
similarity index 100%
rename from spec/sass/semicolon/options.yml
rename to spec/non_conformant/sass/semicolon/options.yml
diff --git a/spec/sass/semicolon/return.hrx b/spec/non_conformant/sass/semicolon/return.hrx
similarity index 100%
rename from spec/sass/semicolon/return.hrx
rename to spec/non_conformant/sass/semicolon/return.hrx
diff --git a/spec/sass/semicolon/variable.hrx b/spec/non_conformant/sass/semicolon/variable.hrx
similarity index 100%
rename from spec/sass/semicolon/variable.hrx
rename to spec/non_conformant/sass/semicolon/variable.hrx
diff --git a/spec/sass/semicolon/warn.hrx b/spec/non_conformant/sass/semicolon/warn.hrx
similarity index 100%
rename from spec/sass/semicolon/warn.hrx
rename to spec/non_conformant/sass/semicolon/warn.hrx
diff --git a/spec/sass/var-args/error.hrx b/spec/non_conformant/sass/var-args/error.hrx
similarity index 100%
rename from spec/sass/var-args/error.hrx
rename to spec/non_conformant/sass/var-args/error.hrx
diff --git a/spec/sass/var-args/success.hrx b/spec/non_conformant/sass/var-args/success.hrx
similarity index 100%
rename from spec/sass/var-args/success.hrx
rename to spec/non_conformant/sass/var-args/success.hrx
diff --git a/spec/sass_4_0/color_arithmetic/addition/color_color.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/addition/color_color.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/addition/color_color.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/addition/color_color.hrx
diff --git a/spec/sass_4_0/color_arithmetic/addition/color_number.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/addition/color_number.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/addition/color_number.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/addition/color_number.hrx
diff --git a/spec/sass_4_0/color_arithmetic/addition/number_color.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/addition/number_color.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/addition/number_color.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/addition/number_color.hrx
diff --git a/spec/sass_4_0/color_arithmetic/division/color_color.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/division/color_color.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/division/color_color.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/division/color_color.hrx
diff --git a/spec/sass_4_0/color_arithmetic/division/color_number.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/division/color_number.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/division/color_number.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/division/color_number.hrx
diff --git a/spec/sass_4_0/color_arithmetic/modulo/color_color.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/modulo/color_color.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/modulo/color_color.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/modulo/color_color.hrx
diff --git a/spec/sass_4_0/color_arithmetic/modulo/color_number.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/modulo/color_number.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/modulo/color_number.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/modulo/color_number.hrx
diff --git a/spec/sass_4_0/color_arithmetic/multiplication/color_color.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/multiplication/color_color.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/multiplication/color_color.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/multiplication/color_color.hrx
diff --git a/spec/sass_4_0/color_arithmetic/multiplication/color_number.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/multiplication/color_number.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/multiplication/color_number.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/multiplication/color_number.hrx
diff --git a/spec/sass_4_0/color_arithmetic/multiplication/number_color.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/multiplication/number_color.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/multiplication/number_color.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/multiplication/number_color.hrx
diff --git a/spec/sass_4_0/color_arithmetic/options.yml b/spec/non_conformant/sass_4_0/color_arithmetic/options.yml
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/options.yml
rename to spec/non_conformant/sass_4_0/color_arithmetic/options.yml
diff --git a/spec/sass_4_0/color_arithmetic/subtraction/color_color.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/subtraction/color_color.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/subtraction/color_color.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/subtraction/color_color.hrx
diff --git a/spec/sass_4_0/color_arithmetic/subtraction/color_number.hrx b/spec/non_conformant/sass_4_0/color_arithmetic/subtraction/color_number.hrx
similarity index 100%
rename from spec/sass_4_0/color_arithmetic/subtraction/color_number.hrx
rename to spec/non_conformant/sass_4_0/color_arithmetic/subtraction/color_number.hrx
diff --git a/spec/sass_4_0/interpolation/after_hyphen.hrx b/spec/non_conformant/sass_4_0/interpolation/after_hyphen.hrx
similarity index 100%
rename from spec/sass_4_0/interpolation/after_hyphen.hrx
rename to spec/non_conformant/sass_4_0/interpolation/after_hyphen.hrx
diff --git a/spec/sass_4_0/interpolation/function_name.hrx b/spec/non_conformant/sass_4_0/interpolation/function_name.hrx
similarity index 100%
rename from spec/sass_4_0/interpolation/function_name.hrx
rename to spec/non_conformant/sass_4_0/interpolation/function_name.hrx
diff --git a/spec/sass_4_0/interpolation/trailing_non_name_start.hrx b/spec/non_conformant/sass_4_0/interpolation/trailing_non_name_start.hrx
similarity index 100%
rename from spec/sass_4_0/interpolation/trailing_non_name_start.hrx
rename to spec/non_conformant/sass_4_0/interpolation/trailing_non_name_start.hrx
diff --git a/spec/scope/clash.hrx b/spec/non_conformant/scope/clash.hrx
similarity index 100%
rename from spec/scope/clash.hrx
rename to spec/non_conformant/scope/clash.hrx
diff --git a/spec/scope/each.hrx b/spec/non_conformant/scope/each.hrx
similarity index 100%
rename from spec/scope/each.hrx
rename to spec/non_conformant/scope/each.hrx
diff --git a/spec/scope/for.hrx b/spec/non_conformant/scope/for.hrx
similarity index 100%
rename from spec/scope/for.hrx
rename to spec/non_conformant/scope/for.hrx
diff --git a/spec/scope/function.hrx b/spec/non_conformant/scope/function.hrx
similarity index 100%
rename from spec/scope/function.hrx
rename to spec/non_conformant/scope/function.hrx
diff --git a/spec/scope/if.hrx b/spec/non_conformant/scope/if.hrx
similarity index 100%
rename from spec/scope/if.hrx
rename to spec/non_conformant/scope/if.hrx
diff --git a/spec/scope/mixin.hrx b/spec/non_conformant/scope/mixin.hrx
similarity index 100%
rename from spec/scope/mixin.hrx
rename to spec/non_conformant/scope/mixin.hrx
diff --git a/spec/scope/nested.hrx b/spec/non_conformant/scope/nested.hrx
similarity index 100%
rename from spec/scope/nested.hrx
rename to spec/non_conformant/scope/nested.hrx
diff --git a/spec/scope/root.hrx b/spec/non_conformant/scope/root.hrx
similarity index 100%
rename from spec/scope/root.hrx
rename to spec/non_conformant/scope/root.hrx
diff --git a/spec/scope/ruleset.hrx b/spec/non_conformant/scope/ruleset.hrx
similarity index 100%
rename from spec/scope/ruleset.hrx
rename to spec/non_conformant/scope/ruleset.hrx
diff --git a/spec/scope/while.hrx b/spec/non_conformant/scope/while.hrx
similarity index 100%
rename from spec/scope/while.hrx
rename to spec/non_conformant/scope/while.hrx
diff --git a/spec/scss-tests/001_test_one_line_comments.hrx b/spec/non_conformant/scss-tests/001_test_one_line_comments.hrx
similarity index 100%
rename from spec/scss-tests/001_test_one_line_comments.hrx
rename to spec/non_conformant/scss-tests/001_test_one_line_comments.hrx
diff --git a/spec/scss-tests/002_test_one_line_comments.hrx b/spec/non_conformant/scss-tests/002_test_one_line_comments.hrx
similarity index 100%
rename from spec/scss-tests/002_test_one_line_comments.hrx
rename to spec/non_conformant/scss-tests/002_test_one_line_comments.hrx
diff --git a/spec/scss-tests/003_test_variables.hrx b/spec/non_conformant/scss-tests/003_test_variables.hrx
similarity index 100%
rename from spec/scss-tests/003_test_variables.hrx
rename to spec/non_conformant/scss-tests/003_test_variables.hrx
diff --git a/spec/scss-tests/004_test_variables.hrx b/spec/non_conformant/scss-tests/004_test_variables.hrx
similarity index 100%
rename from spec/scss-tests/004_test_variables.hrx
rename to spec/non_conformant/scss-tests/004_test_variables.hrx
diff --git a/spec/scss-tests/005_test_unicode_variables/input.scss b/spec/non_conformant/scss-tests/005_test_unicode_variables/input.scss
similarity index 100%
rename from spec/scss-tests/005_test_unicode_variables/input.scss
rename to spec/non_conformant/scss-tests/005_test_unicode_variables/input.scss
diff --git a/spec/scss-tests/005_test_unicode_variables/output.css b/spec/non_conformant/scss-tests/005_test_unicode_variables/output.css
similarity index 100%
rename from spec/scss-tests/005_test_unicode_variables/output.css
rename to spec/non_conformant/scss-tests/005_test_unicode_variables/output.css
diff --git a/spec/scss-tests/006_test_guard_assign.hrx b/spec/non_conformant/scss-tests/006_test_guard_assign.hrx
similarity index 100%
rename from spec/scss-tests/006_test_guard_assign.hrx
rename to spec/non_conformant/scss-tests/006_test_guard_assign.hrx
diff --git a/spec/scss-tests/007_test_guard_assign.hrx b/spec/non_conformant/scss-tests/007_test_guard_assign.hrx
similarity index 100%
rename from spec/scss-tests/007_test_guard_assign.hrx
rename to spec/non_conformant/scss-tests/007_test_guard_assign.hrx
diff --git a/spec/scss-tests/008_test_sass_script.hrx b/spec/non_conformant/scss-tests/008_test_sass_script.hrx
similarity index 100%
rename from spec/scss-tests/008_test_sass_script.hrx
rename to spec/non_conformant/scss-tests/008_test_sass_script.hrx
diff --git a/spec/scss-tests/009_test_for_directive.hrx b/spec/non_conformant/scss-tests/009_test_for_directive.hrx
similarity index 100%
rename from spec/scss-tests/009_test_for_directive.hrx
rename to spec/non_conformant/scss-tests/009_test_for_directive.hrx
diff --git a/spec/scss-tests/010_test_for_directive.hrx b/spec/non_conformant/scss-tests/010_test_for_directive.hrx
similarity index 100%
rename from spec/scss-tests/010_test_for_directive.hrx
rename to spec/non_conformant/scss-tests/010_test_for_directive.hrx
diff --git a/spec/scss-tests/011_test_if_directive.hrx b/spec/non_conformant/scss-tests/011_test_if_directive.hrx
similarity index 100%
rename from spec/scss-tests/011_test_if_directive.hrx
rename to spec/non_conformant/scss-tests/011_test_if_directive.hrx
diff --git a/spec/scss-tests/012_test_if_directive.hrx b/spec/non_conformant/scss-tests/012_test_if_directive.hrx
similarity index 100%
rename from spec/scss-tests/012_test_if_directive.hrx
rename to spec/non_conformant/scss-tests/012_test_if_directive.hrx
diff --git a/spec/scss-tests/013_test_if_directive.hrx b/spec/non_conformant/scss-tests/013_test_if_directive.hrx
similarity index 100%
rename from spec/scss-tests/013_test_if_directive.hrx
rename to spec/non_conformant/scss-tests/013_test_if_directive.hrx
diff --git a/spec/scss-tests/014_test_comment_after_if_directive.hrx b/spec/non_conformant/scss-tests/014_test_comment_after_if_directive.hrx
similarity index 100%
rename from spec/scss-tests/014_test_comment_after_if_directive.hrx
rename to spec/non_conformant/scss-tests/014_test_comment_after_if_directive.hrx
diff --git a/spec/scss-tests/015_test_comment_after_if_directive.hrx b/spec/non_conformant/scss-tests/015_test_comment_after_if_directive.hrx
similarity index 100%
rename from spec/scss-tests/015_test_comment_after_if_directive.hrx
rename to spec/non_conformant/scss-tests/015_test_comment_after_if_directive.hrx
diff --git a/spec/scss-tests/017_test_each_directive.hrx b/spec/non_conformant/scss-tests/017_test_each_directive.hrx
similarity index 100%
rename from spec/scss-tests/017_test_each_directive.hrx
rename to spec/non_conformant/scss-tests/017_test_each_directive.hrx
diff --git a/spec/scss-tests/019_test_css_import_directive.hrx b/spec/non_conformant/scss-tests/019_test_css_import_directive.hrx
similarity index 100%
rename from spec/scss-tests/019_test_css_import_directive.hrx
rename to spec/non_conformant/scss-tests/019_test_css_import_directive.hrx
diff --git a/spec/scss-tests/020_test_css_import_directive.hrx b/spec/non_conformant/scss-tests/020_test_css_import_directive.hrx
similarity index 100%
rename from spec/scss-tests/020_test_css_import_directive.hrx
rename to spec/non_conformant/scss-tests/020_test_css_import_directive.hrx
diff --git a/spec/scss-tests/021_test_css_import_directive.hrx b/spec/non_conformant/scss-tests/021_test_css_import_directive.hrx
similarity index 100%
rename from spec/scss-tests/021_test_css_import_directive.hrx
rename to spec/non_conformant/scss-tests/021_test_css_import_directive.hrx
diff --git a/spec/scss-tests/022_test_css_import_directive.hrx b/spec/non_conformant/scss-tests/022_test_css_import_directive.hrx
similarity index 100%
rename from spec/scss-tests/022_test_css_import_directive.hrx
rename to spec/non_conformant/scss-tests/022_test_css_import_directive.hrx
diff --git a/spec/scss-tests/023_test_css_import_directive.hrx b/spec/non_conformant/scss-tests/023_test_css_import_directive.hrx
similarity index 100%
rename from spec/scss-tests/023_test_css_import_directive.hrx
rename to spec/non_conformant/scss-tests/023_test_css_import_directive.hrx
diff --git a/spec/scss-tests/024_test_media_import.hrx b/spec/non_conformant/scss-tests/024_test_media_import.hrx
similarity index 100%
rename from spec/scss-tests/024_test_media_import.hrx
rename to spec/non_conformant/scss-tests/024_test_media_import.hrx
diff --git a/spec/scss-tests/025_test_dynamic_media_import.hrx b/spec/non_conformant/scss-tests/025_test_dynamic_media_import.hrx
similarity index 100%
rename from spec/scss-tests/025_test_dynamic_media_import.hrx
rename to spec/non_conformant/scss-tests/025_test_dynamic_media_import.hrx
diff --git a/spec/scss-tests/027_test_protocol_relative_import.hrx b/spec/non_conformant/scss-tests/027_test_protocol_relative_import.hrx
similarity index 100%
rename from spec/scss-tests/027_test_protocol_relative_import.hrx
rename to spec/non_conformant/scss-tests/027_test_protocol_relative_import.hrx
diff --git a/spec/scss-tests/028_test_import_with_interpolation.hrx b/spec/non_conformant/scss-tests/028_test_import_with_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/028_test_import_with_interpolation.hrx
rename to spec/non_conformant/scss-tests/028_test_import_with_interpolation.hrx
diff --git a/spec/scss-tests/029_test_url_import.hrx b/spec/non_conformant/scss-tests/029_test_url_import.hrx
similarity index 100%
rename from spec/scss-tests/029_test_url_import.hrx
rename to spec/non_conformant/scss-tests/029_test_url_import.hrx
diff --git a/spec/scss-tests/030_test_block_comment_in_script.hrx b/spec/non_conformant/scss-tests/030_test_block_comment_in_script.hrx
similarity index 100%
rename from spec/scss-tests/030_test_block_comment_in_script.hrx
rename to spec/non_conformant/scss-tests/030_test_block_comment_in_script.hrx
diff --git a/spec/scss-tests/031_test_line_comment_in_script.hrx b/spec/non_conformant/scss-tests/031_test_line_comment_in_script.hrx
similarity index 100%
rename from spec/scss-tests/031_test_line_comment_in_script.hrx
rename to spec/non_conformant/scss-tests/031_test_line_comment_in_script.hrx
diff --git a/spec/scss-tests/032_test_nested_rules.hrx b/spec/non_conformant/scss-tests/032_test_nested_rules.hrx
similarity index 100%
rename from spec/scss-tests/032_test_nested_rules.hrx
rename to spec/non_conformant/scss-tests/032_test_nested_rules.hrx
diff --git a/spec/scss-tests/033_test_nested_rules.hrx b/spec/non_conformant/scss-tests/033_test_nested_rules.hrx
similarity index 100%
rename from spec/scss-tests/033_test_nested_rules.hrx
rename to spec/non_conformant/scss-tests/033_test_nested_rules.hrx
diff --git a/spec/scss-tests/034_test_nested_rules.hrx b/spec/non_conformant/scss-tests/034_test_nested_rules.hrx
similarity index 100%
rename from spec/scss-tests/034_test_nested_rules.hrx
rename to spec/non_conformant/scss-tests/034_test_nested_rules.hrx
diff --git a/spec/scss-tests/035_test_nested_rules_with_declarations.hrx b/spec/non_conformant/scss-tests/035_test_nested_rules_with_declarations.hrx
similarity index 100%
rename from spec/scss-tests/035_test_nested_rules_with_declarations.hrx
rename to spec/non_conformant/scss-tests/035_test_nested_rules_with_declarations.hrx
diff --git a/spec/scss-tests/036_test_nested_rules_with_declarations.hrx b/spec/non_conformant/scss-tests/036_test_nested_rules_with_declarations.hrx
similarity index 100%
rename from spec/scss-tests/036_test_nested_rules_with_declarations.hrx
rename to spec/non_conformant/scss-tests/036_test_nested_rules_with_declarations.hrx
diff --git a/spec/scss-tests/037_test_nested_rules_with_declarations.hrx b/spec/non_conformant/scss-tests/037_test_nested_rules_with_declarations.hrx
similarity index 100%
rename from spec/scss-tests/037_test_nested_rules_with_declarations.hrx
rename to spec/non_conformant/scss-tests/037_test_nested_rules_with_declarations.hrx
diff --git a/spec/scss-tests/038_test_nested_rules_with_fancy_selectors.hrx b/spec/non_conformant/scss-tests/038_test_nested_rules_with_fancy_selectors.hrx
similarity index 100%
rename from spec/scss-tests/038_test_nested_rules_with_fancy_selectors.hrx
rename to spec/non_conformant/scss-tests/038_test_nested_rules_with_fancy_selectors.hrx
diff --git a/spec/scss-tests/039_test_almost_ambiguous_nested_rules_and_declarations.hrx b/spec/non_conformant/scss-tests/039_test_almost_ambiguous_nested_rules_and_declarations.hrx
similarity index 100%
rename from spec/scss-tests/039_test_almost_ambiguous_nested_rules_and_declarations.hrx
rename to spec/non_conformant/scss-tests/039_test_almost_ambiguous_nested_rules_and_declarations.hrx
diff --git a/spec/scss-tests/040_test_newlines_in_selectors.hrx b/spec/non_conformant/scss-tests/040_test_newlines_in_selectors.hrx
similarity index 100%
rename from spec/scss-tests/040_test_newlines_in_selectors.hrx
rename to spec/non_conformant/scss-tests/040_test_newlines_in_selectors.hrx
diff --git a/spec/scss-tests/041_test_newlines_in_selectors.hrx b/spec/non_conformant/scss-tests/041_test_newlines_in_selectors.hrx
similarity index 100%
rename from spec/scss-tests/041_test_newlines_in_selectors.hrx
rename to spec/non_conformant/scss-tests/041_test_newlines_in_selectors.hrx
diff --git a/spec/scss-tests/042_test_newlines_in_selectors.hrx b/spec/non_conformant/scss-tests/042_test_newlines_in_selectors.hrx
similarity index 100%
rename from spec/scss-tests/042_test_newlines_in_selectors.hrx
rename to spec/non_conformant/scss-tests/042_test_newlines_in_selectors.hrx
diff --git a/spec/scss-tests/043_test_newlines_in_selectors.hrx b/spec/non_conformant/scss-tests/043_test_newlines_in_selectors.hrx
similarity index 100%
rename from spec/scss-tests/043_test_newlines_in_selectors.hrx
rename to spec/non_conformant/scss-tests/043_test_newlines_in_selectors.hrx
diff --git a/spec/scss-tests/044_test_trailing_comma_in_selector.hrx b/spec/non_conformant/scss-tests/044_test_trailing_comma_in_selector.hrx
similarity index 100%
rename from spec/scss-tests/044_test_trailing_comma_in_selector.hrx
rename to spec/non_conformant/scss-tests/044_test_trailing_comma_in_selector.hrx
diff --git a/spec/scss-tests/045_test_parent_selectors.hrx b/spec/non_conformant/scss-tests/045_test_parent_selectors.hrx
similarity index 100%
rename from spec/scss-tests/045_test_parent_selectors.hrx
rename to spec/non_conformant/scss-tests/045_test_parent_selectors.hrx
diff --git a/spec/scss-tests/046_test_parent_selector_with_subject.hrx b/spec/non_conformant/scss-tests/046_test_parent_selector_with_subject.hrx
similarity index 100%
rename from spec/scss-tests/046_test_parent_selector_with_subject.hrx
rename to spec/non_conformant/scss-tests/046_test_parent_selector_with_subject.hrx
diff --git a/spec/scss-tests/047_test_unknown_directive_bubbling.hrx b/spec/non_conformant/scss-tests/047_test_unknown_directive_bubbling.hrx
similarity index 100%
rename from spec/scss-tests/047_test_unknown_directive_bubbling.hrx
rename to spec/non_conformant/scss-tests/047_test_unknown_directive_bubbling.hrx
diff --git a/spec/scss-tests/048_test_namespace_properties.hrx b/spec/non_conformant/scss-tests/048_test_namespace_properties.hrx
similarity index 100%
rename from spec/scss-tests/048_test_namespace_properties.hrx
rename to spec/non_conformant/scss-tests/048_test_namespace_properties.hrx
diff --git a/spec/scss-tests/049_test_several_namespace_properties.hrx b/spec/non_conformant/scss-tests/049_test_several_namespace_properties.hrx
similarity index 100%
rename from spec/scss-tests/049_test_several_namespace_properties.hrx
rename to spec/non_conformant/scss-tests/049_test_several_namespace_properties.hrx
diff --git a/spec/scss-tests/050_test_nested_namespace_properties.hrx b/spec/non_conformant/scss-tests/050_test_nested_namespace_properties.hrx
similarity index 100%
rename from spec/scss-tests/050_test_nested_namespace_properties.hrx
rename to spec/non_conformant/scss-tests/050_test_nested_namespace_properties.hrx
diff --git a/spec/scss-tests/051_test_namespace_properties_with_value.hrx b/spec/non_conformant/scss-tests/051_test_namespace_properties_with_value.hrx
similarity index 100%
rename from spec/scss-tests/051_test_namespace_properties_with_value.hrx
rename to spec/non_conformant/scss-tests/051_test_namespace_properties_with_value.hrx
diff --git a/spec/scss-tests/052_test_namespace_properties_with_script_value.hrx b/spec/non_conformant/scss-tests/052_test_namespace_properties_with_script_value.hrx
similarity index 100%
rename from spec/scss-tests/052_test_namespace_properties_with_script_value.hrx
rename to spec/non_conformant/scss-tests/052_test_namespace_properties_with_script_value.hrx
diff --git a/spec/scss-tests/053_test_no_namespace_properties_without_space.hrx b/spec/non_conformant/scss-tests/053_test_no_namespace_properties_without_space.hrx
similarity index 100%
rename from spec/scss-tests/053_test_no_namespace_properties_without_space.hrx
rename to spec/non_conformant/scss-tests/053_test_no_namespace_properties_without_space.hrx
diff --git a/spec/scss-tests/054_test_basic_mixins.hrx b/spec/non_conformant/scss-tests/054_test_basic_mixins.hrx
similarity index 100%
rename from spec/scss-tests/054_test_basic_mixins.hrx
rename to spec/non_conformant/scss-tests/054_test_basic_mixins.hrx
diff --git a/spec/scss-tests/055_test_basic_mixins.hrx b/spec/non_conformant/scss-tests/055_test_basic_mixins.hrx
similarity index 100%
rename from spec/scss-tests/055_test_basic_mixins.hrx
rename to spec/non_conformant/scss-tests/055_test_basic_mixins.hrx
diff --git a/spec/scss-tests/056_test_basic_mixins.hrx b/spec/non_conformant/scss-tests/056_test_basic_mixins.hrx
similarity index 100%
rename from spec/scss-tests/056_test_basic_mixins.hrx
rename to spec/non_conformant/scss-tests/056_test_basic_mixins.hrx
diff --git a/spec/scss-tests/057_test_mixins_with_empty_args.hrx b/spec/non_conformant/scss-tests/057_test_mixins_with_empty_args.hrx
similarity index 100%
rename from spec/scss-tests/057_test_mixins_with_empty_args.hrx
rename to spec/non_conformant/scss-tests/057_test_mixins_with_empty_args.hrx
diff --git a/spec/scss-tests/058_test_mixins_with_empty_args.hrx b/spec/non_conformant/scss-tests/058_test_mixins_with_empty_args.hrx
similarity index 100%
rename from spec/scss-tests/058_test_mixins_with_empty_args.hrx
rename to spec/non_conformant/scss-tests/058_test_mixins_with_empty_args.hrx
diff --git a/spec/scss-tests/059_test_mixins_with_empty_args.hrx b/spec/non_conformant/scss-tests/059_test_mixins_with_empty_args.hrx
similarity index 100%
rename from spec/scss-tests/059_test_mixins_with_empty_args.hrx
rename to spec/non_conformant/scss-tests/059_test_mixins_with_empty_args.hrx
diff --git a/spec/scss-tests/060_test_mixins_with_args.hrx b/spec/non_conformant/scss-tests/060_test_mixins_with_args.hrx
similarity index 100%
rename from spec/scss-tests/060_test_mixins_with_args.hrx
rename to spec/non_conformant/scss-tests/060_test_mixins_with_args.hrx
diff --git a/spec/scss-tests/061_test_mixins_with_args.hrx b/spec/non_conformant/scss-tests/061_test_mixins_with_args.hrx
similarity index 100%
rename from spec/scss-tests/061_test_mixins_with_args.hrx
rename to spec/non_conformant/scss-tests/061_test_mixins_with_args.hrx
diff --git a/spec/scss-tests/062_test_basic_function.hrx b/spec/non_conformant/scss-tests/062_test_basic_function.hrx
similarity index 100%
rename from spec/scss-tests/062_test_basic_function.hrx
rename to spec/non_conformant/scss-tests/062_test_basic_function.hrx
diff --git a/spec/scss-tests/063_test_function_args.hrx b/spec/non_conformant/scss-tests/063_test_function_args.hrx
similarity index 100%
rename from spec/scss-tests/063_test_function_args.hrx
rename to spec/non_conformant/scss-tests/063_test_function_args.hrx
diff --git a/spec/scss-tests/064_test_mixin_var_args.hrx b/spec/non_conformant/scss-tests/064_test_mixin_var_args.hrx
similarity index 100%
rename from spec/scss-tests/064_test_mixin_var_args.hrx
rename to spec/non_conformant/scss-tests/064_test_mixin_var_args.hrx
diff --git a/spec/scss-tests/065_test_mixin_empty_var_args.hrx b/spec/non_conformant/scss-tests/065_test_mixin_empty_var_args.hrx
similarity index 100%
rename from spec/scss-tests/065_test_mixin_empty_var_args.hrx
rename to spec/non_conformant/scss-tests/065_test_mixin_empty_var_args.hrx
diff --git a/spec/scss-tests/066_test_mixin_var_args_act_like_list.hrx b/spec/non_conformant/scss-tests/066_test_mixin_var_args_act_like_list.hrx
similarity index 100%
rename from spec/scss-tests/066_test_mixin_var_args_act_like_list.hrx
rename to spec/non_conformant/scss-tests/066_test_mixin_var_args_act_like_list.hrx
diff --git a/spec/scss-tests/067_test_mixin_splat_args.hrx b/spec/non_conformant/scss-tests/067_test_mixin_splat_args.hrx
similarity index 100%
rename from spec/scss-tests/067_test_mixin_splat_args.hrx
rename to spec/non_conformant/scss-tests/067_test_mixin_splat_args.hrx
diff --git a/spec/scss-tests/068_test_mixin_splat_expression.hrx b/spec/non_conformant/scss-tests/068_test_mixin_splat_expression.hrx
similarity index 100%
rename from spec/scss-tests/068_test_mixin_splat_expression.hrx
rename to spec/non_conformant/scss-tests/068_test_mixin_splat_expression.hrx
diff --git a/spec/scss-tests/069_test_mixin_splat_args_with_var_args.hrx b/spec/non_conformant/scss-tests/069_test_mixin_splat_args_with_var_args.hrx
similarity index 100%
rename from spec/scss-tests/069_test_mixin_splat_args_with_var_args.hrx
rename to spec/non_conformant/scss-tests/069_test_mixin_splat_args_with_var_args.hrx
diff --git a/spec/scss-tests/070_test_mixin_splat_args_with_var_args_and_normal_args.hrx b/spec/non_conformant/scss-tests/070_test_mixin_splat_args_with_var_args_and_normal_args.hrx
similarity index 100%
rename from spec/scss-tests/070_test_mixin_splat_args_with_var_args_and_normal_args.hrx
rename to spec/non_conformant/scss-tests/070_test_mixin_splat_args_with_var_args_and_normal_args.hrx
diff --git a/spec/scss-tests/071_test_mixin_splat_args_with_var_args_preserves_separator.hrx b/spec/non_conformant/scss-tests/071_test_mixin_splat_args_with_var_args_preserves_separator.hrx
similarity index 100%
rename from spec/scss-tests/071_test_mixin_splat_args_with_var_args_preserves_separator.hrx
rename to spec/non_conformant/scss-tests/071_test_mixin_splat_args_with_var_args_preserves_separator.hrx
diff --git a/spec/scss-tests/072_test_mixin_var_and_splat_args_pass_through_keywords.hrx b/spec/non_conformant/scss-tests/072_test_mixin_var_and_splat_args_pass_through_keywords.hrx
similarity index 100%
rename from spec/scss-tests/072_test_mixin_var_and_splat_args_pass_through_keywords.hrx
rename to spec/non_conformant/scss-tests/072_test_mixin_var_and_splat_args_pass_through_keywords.hrx
diff --git a/spec/scss-tests/078_test_mixin_list_of_pairs_splat_treated_as_list.hrx b/spec/non_conformant/scss-tests/078_test_mixin_list_of_pairs_splat_treated_as_list.hrx
similarity index 100%
rename from spec/scss-tests/078_test_mixin_list_of_pairs_splat_treated_as_list.hrx
rename to spec/non_conformant/scss-tests/078_test_mixin_list_of_pairs_splat_treated_as_list.hrx
diff --git a/spec/scss-tests/083_test_function_var_args.hrx b/spec/non_conformant/scss-tests/083_test_function_var_args.hrx
similarity index 100%
rename from spec/scss-tests/083_test_function_var_args.hrx
rename to spec/non_conformant/scss-tests/083_test_function_var_args.hrx
diff --git a/spec/scss-tests/084_test_function_empty_var_args.hrx b/spec/non_conformant/scss-tests/084_test_function_empty_var_args.hrx
similarity index 100%
rename from spec/scss-tests/084_test_function_empty_var_args.hrx
rename to spec/non_conformant/scss-tests/084_test_function_empty_var_args.hrx
diff --git a/spec/scss-tests/085_test_function_var_args_act_like_list.hrx b/spec/non_conformant/scss-tests/085_test_function_var_args_act_like_list.hrx
similarity index 100%
rename from spec/scss-tests/085_test_function_var_args_act_like_list.hrx
rename to spec/non_conformant/scss-tests/085_test_function_var_args_act_like_list.hrx
diff --git a/spec/scss-tests/086_test_function_splat_args.hrx b/spec/non_conformant/scss-tests/086_test_function_splat_args.hrx
similarity index 100%
rename from spec/scss-tests/086_test_function_splat_args.hrx
rename to spec/non_conformant/scss-tests/086_test_function_splat_args.hrx
diff --git a/spec/scss-tests/087_test_function_splat_expression.hrx b/spec/non_conformant/scss-tests/087_test_function_splat_expression.hrx
similarity index 100%
rename from spec/scss-tests/087_test_function_splat_expression.hrx
rename to spec/non_conformant/scss-tests/087_test_function_splat_expression.hrx
diff --git a/spec/scss-tests/088_test_function_splat_args_with_var_args.hrx b/spec/non_conformant/scss-tests/088_test_function_splat_args_with_var_args.hrx
similarity index 100%
rename from spec/scss-tests/088_test_function_splat_args_with_var_args.hrx
rename to spec/non_conformant/scss-tests/088_test_function_splat_args_with_var_args.hrx
diff --git a/spec/scss-tests/089_test_function_splat_args_with_var_args_and_normal_args.hrx b/spec/non_conformant/scss-tests/089_test_function_splat_args_with_var_args_and_normal_args.hrx
similarity index 100%
rename from spec/scss-tests/089_test_function_splat_args_with_var_args_and_normal_args.hrx
rename to spec/non_conformant/scss-tests/089_test_function_splat_args_with_var_args_and_normal_args.hrx
diff --git a/spec/scss-tests/090_test_function_splat_args_with_var_args_preserves_separator.hrx b/spec/non_conformant/scss-tests/090_test_function_splat_args_with_var_args_preserves_separator.hrx
similarity index 100%
rename from spec/scss-tests/090_test_function_splat_args_with_var_args_preserves_separator.hrx
rename to spec/non_conformant/scss-tests/090_test_function_splat_args_with_var_args_preserves_separator.hrx
diff --git a/spec/scss-tests/091_test_function_var_and_splat_args_pass_through_keywords.hrx b/spec/non_conformant/scss-tests/091_test_function_var_and_splat_args_pass_through_keywords.hrx
similarity index 100%
rename from spec/scss-tests/091_test_function_var_and_splat_args_pass_through_keywords.hrx
rename to spec/non_conformant/scss-tests/091_test_function_var_and_splat_args_pass_through_keywords.hrx
diff --git a/spec/scss-tests/098_test_function_list_of_pairs_splat_treated_as_list.hrx b/spec/non_conformant/scss-tests/098_test_function_list_of_pairs_splat_treated_as_list.hrx
similarity index 100%
rename from spec/scss-tests/098_test_function_list_of_pairs_splat_treated_as_list.hrx
rename to spec/non_conformant/scss-tests/098_test_function_list_of_pairs_splat_treated_as_list.hrx
diff --git a/spec/scss-tests/103_test_function_var_args_passed_to_native.hrx b/spec/non_conformant/scss-tests/103_test_function_var_args_passed_to_native.hrx
similarity index 100%
rename from spec/scss-tests/103_test_function_var_args_passed_to_native.hrx
rename to spec/non_conformant/scss-tests/103_test_function_var_args_passed_to_native.hrx
diff --git a/spec/scss-tests/104_test_basic_selector_interpolation.hrx b/spec/non_conformant/scss-tests/104_test_basic_selector_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/104_test_basic_selector_interpolation.hrx
rename to spec/non_conformant/scss-tests/104_test_basic_selector_interpolation.hrx
diff --git a/spec/scss-tests/105_test_basic_selector_interpolation.hrx b/spec/non_conformant/scss-tests/105_test_basic_selector_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/105_test_basic_selector_interpolation.hrx
rename to spec/non_conformant/scss-tests/105_test_basic_selector_interpolation.hrx
diff --git a/spec/scss-tests/106_test_basic_selector_interpolation.hrx b/spec/non_conformant/scss-tests/106_test_basic_selector_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/106_test_basic_selector_interpolation.hrx
rename to spec/non_conformant/scss-tests/106_test_basic_selector_interpolation.hrx
diff --git a/spec/scss-tests/107_test_selector_only_interpolation.hrx b/spec/non_conformant/scss-tests/107_test_selector_only_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/107_test_selector_only_interpolation.hrx
rename to spec/non_conformant/scss-tests/107_test_selector_only_interpolation.hrx
diff --git a/spec/scss-tests/108_test_selector_interpolation_before_element_name.hrx b/spec/non_conformant/scss-tests/108_test_selector_interpolation_before_element_name.hrx
similarity index 100%
rename from spec/scss-tests/108_test_selector_interpolation_before_element_name.hrx
rename to spec/non_conformant/scss-tests/108_test_selector_interpolation_before_element_name.hrx
diff --git a/spec/scss-tests/109_test_selector_interpolation_in_string.hrx b/spec/non_conformant/scss-tests/109_test_selector_interpolation_in_string.hrx
similarity index 100%
rename from spec/scss-tests/109_test_selector_interpolation_in_string.hrx
rename to spec/non_conformant/scss-tests/109_test_selector_interpolation_in_string.hrx
diff --git a/spec/scss-tests/110_test_selector_interpolation_in_pseudoclass.hrx b/spec/non_conformant/scss-tests/110_test_selector_interpolation_in_pseudoclass.hrx
similarity index 100%
rename from spec/scss-tests/110_test_selector_interpolation_in_pseudoclass.hrx
rename to spec/non_conformant/scss-tests/110_test_selector_interpolation_in_pseudoclass.hrx
diff --git a/spec/scss-tests/111_test_selector_interpolation_at_class_begininng.hrx b/spec/non_conformant/scss-tests/111_test_selector_interpolation_at_class_begininng.hrx
similarity index 100%
rename from spec/scss-tests/111_test_selector_interpolation_at_class_begininng.hrx
rename to spec/non_conformant/scss-tests/111_test_selector_interpolation_at_class_begininng.hrx
diff --git a/spec/scss-tests/112_test_selector_interpolation_at_id_begininng.hrx b/spec/non_conformant/scss-tests/112_test_selector_interpolation_at_id_begininng.hrx
similarity index 100%
rename from spec/scss-tests/112_test_selector_interpolation_at_id_begininng.hrx
rename to spec/non_conformant/scss-tests/112_test_selector_interpolation_at_id_begininng.hrx
diff --git a/spec/scss-tests/113_test_selector_interpolation_at_pseudo_begininng.hrx b/spec/non_conformant/scss-tests/113_test_selector_interpolation_at_pseudo_begininng.hrx
similarity index 100%
rename from spec/scss-tests/113_test_selector_interpolation_at_pseudo_begininng.hrx
rename to spec/non_conformant/scss-tests/113_test_selector_interpolation_at_pseudo_begininng.hrx
diff --git a/spec/scss-tests/114_test_selector_interpolation_at_attr_beginning.hrx b/spec/non_conformant/scss-tests/114_test_selector_interpolation_at_attr_beginning.hrx
similarity index 100%
rename from spec/scss-tests/114_test_selector_interpolation_at_attr_beginning.hrx
rename to spec/non_conformant/scss-tests/114_test_selector_interpolation_at_attr_beginning.hrx
diff --git a/spec/scss-tests/115_test_selector_interpolation_at_attr_end.hrx b/spec/non_conformant/scss-tests/115_test_selector_interpolation_at_attr_end.hrx
similarity index 100%
rename from spec/scss-tests/115_test_selector_interpolation_at_attr_end.hrx
rename to spec/non_conformant/scss-tests/115_test_selector_interpolation_at_attr_end.hrx
diff --git a/spec/scss-tests/116_test_selector_interpolation_at_dashes.hrx b/spec/non_conformant/scss-tests/116_test_selector_interpolation_at_dashes.hrx
similarity index 100%
rename from spec/scss-tests/116_test_selector_interpolation_at_dashes.hrx
rename to spec/non_conformant/scss-tests/116_test_selector_interpolation_at_dashes.hrx
diff --git a/spec/scss-tests/118_test_parent_selector_with_parent_and_subject.hrx b/spec/non_conformant/scss-tests/118_test_parent_selector_with_parent_and_subject.hrx
similarity index 100%
rename from spec/scss-tests/118_test_parent_selector_with_parent_and_subject.hrx
rename to spec/non_conformant/scss-tests/118_test_parent_selector_with_parent_and_subject.hrx
diff --git a/spec/scss-tests/119_test_basic_prop_name_interpolation.hrx b/spec/non_conformant/scss-tests/119_test_basic_prop_name_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/119_test_basic_prop_name_interpolation.hrx
rename to spec/non_conformant/scss-tests/119_test_basic_prop_name_interpolation.hrx
diff --git a/spec/scss-tests/120_test_basic_prop_name_interpolation.hrx b/spec/non_conformant/scss-tests/120_test_basic_prop_name_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/120_test_basic_prop_name_interpolation.hrx
rename to spec/non_conformant/scss-tests/120_test_basic_prop_name_interpolation.hrx
diff --git a/spec/scss-tests/121_test_prop_name_only_interpolation.hrx b/spec/non_conformant/scss-tests/121_test_prop_name_only_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/121_test_prop_name_only_interpolation.hrx
rename to spec/non_conformant/scss-tests/121_test_prop_name_only_interpolation.hrx
diff --git a/spec/scss-tests/122_test_directive_interpolation.hrx b/spec/non_conformant/scss-tests/122_test_directive_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/122_test_directive_interpolation.hrx
rename to spec/non_conformant/scss-tests/122_test_directive_interpolation.hrx
diff --git a/spec/scss-tests/128_test_supports_with_expressions.hrx b/spec/non_conformant/scss-tests/128_test_supports_with_expressions.hrx
similarity index 100%
rename from spec/scss-tests/128_test_supports_with_expressions.hrx
rename to spec/non_conformant/scss-tests/128_test_supports_with_expressions.hrx
diff --git a/spec/scss-tests/129_test_supports_bubbling.hrx b/spec/non_conformant/scss-tests/129_test_supports_bubbling.hrx
similarity index 100%
rename from spec/scss-tests/129_test_supports_bubbling.hrx
rename to spec/non_conformant/scss-tests/129_test_supports_bubbling.hrx
diff --git a/spec/scss-tests/130_test_random_directive_interpolation.hrx b/spec/non_conformant/scss-tests/130_test_random_directive_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/130_test_random_directive_interpolation.hrx
rename to spec/non_conformant/scss-tests/130_test_random_directive_interpolation.hrx
diff --git a/spec/scss-tests/131_test_nested_mixin_def.hrx b/spec/non_conformant/scss-tests/131_test_nested_mixin_def.hrx
similarity index 100%
rename from spec/scss-tests/131_test_nested_mixin_def.hrx
rename to spec/non_conformant/scss-tests/131_test_nested_mixin_def.hrx
diff --git a/spec/scss-tests/132_test_nested_mixin_shadow.hrx b/spec/non_conformant/scss-tests/132_test_nested_mixin_shadow.hrx
similarity index 100%
rename from spec/scss-tests/132_test_nested_mixin_shadow.hrx
rename to spec/non_conformant/scss-tests/132_test_nested_mixin_shadow.hrx
diff --git a/spec/scss-tests/133_test_nested_function_def.hrx b/spec/non_conformant/scss-tests/133_test_nested_function_def.hrx
similarity index 100%
rename from spec/scss-tests/133_test_nested_function_def.hrx
rename to spec/non_conformant/scss-tests/133_test_nested_function_def.hrx
diff --git a/spec/scss-tests/134_test_nested_function_shadow.hrx b/spec/non_conformant/scss-tests/134_test_nested_function_shadow.hrx
similarity index 100%
rename from spec/scss-tests/134_test_nested_function_shadow.hrx
rename to spec/non_conformant/scss-tests/134_test_nested_function_shadow.hrx
diff --git a/spec/scss-tests/171_test_loud_comment_in_compressed_mode.hrx b/spec/non_conformant/scss-tests/171_test_loud_comment_in_compressed_mode.hrx
similarity index 100%
rename from spec/scss-tests/171_test_loud_comment_in_compressed_mode.hrx
rename to spec/non_conformant/scss-tests/171_test_loud_comment_in_compressed_mode.hrx
diff --git a/spec/scss-tests/172_test_parsing_decimals_followed_by_comments_doesnt_take_forever.hrx b/spec/non_conformant/scss-tests/172_test_parsing_decimals_followed_by_comments_doesnt_take_forever.hrx
similarity index 100%
rename from spec/scss-tests/172_test_parsing_decimals_followed_by_comments_doesnt_take_forever.hrx
rename to spec/non_conformant/scss-tests/172_test_parsing_decimals_followed_by_comments_doesnt_take_forever.hrx
diff --git a/spec/scss-tests/173_test_parsing_many_numbers_doesnt_take_forever.hrx b/spec/non_conformant/scss-tests/173_test_parsing_many_numbers_doesnt_take_forever.hrx
similarity index 100%
rename from spec/scss-tests/173_test_parsing_many_numbers_doesnt_take_forever.hrx
rename to spec/non_conformant/scss-tests/173_test_parsing_many_numbers_doesnt_take_forever.hrx
diff --git a/spec/scss-tests/174_test_import_comments_in_imports.hrx b/spec/non_conformant/scss-tests/174_test_import_comments_in_imports.hrx
similarity index 100%
rename from spec/scss-tests/174_test_import_comments_in_imports.hrx
rename to spec/non_conformant/scss-tests/174_test_import_comments_in_imports.hrx
diff --git a/spec/scss-tests/176_test_newline_selector_rendered_multiple_times.hrx b/spec/non_conformant/scss-tests/176_test_newline_selector_rendered_multiple_times.hrx
similarity index 100%
rename from spec/scss-tests/176_test_newline_selector_rendered_multiple_times.hrx
rename to spec/non_conformant/scss-tests/176_test_newline_selector_rendered_multiple_times.hrx
diff --git a/spec/scss-tests/177_test_prop_name_interpolation_after_hyphen.hrx b/spec/non_conformant/scss-tests/177_test_prop_name_interpolation_after_hyphen.hrx
similarity index 100%
rename from spec/scss-tests/177_test_prop_name_interpolation_after_hyphen.hrx
rename to spec/non_conformant/scss-tests/177_test_prop_name_interpolation_after_hyphen.hrx
diff --git a/spec/scss-tests/178_test_star_plus_and_parent.hrx b/spec/non_conformant/scss-tests/178_test_star_plus_and_parent.hrx
similarity index 100%
rename from spec/scss-tests/178_test_star_plus_and_parent.hrx
rename to spec/non_conformant/scss-tests/178_test_star_plus_and_parent.hrx
diff --git a/spec/scss-tests/179_test_weird_added_space.hrx b/spec/non_conformant/scss-tests/179_test_weird_added_space.hrx
similarity index 100%
rename from spec/scss-tests/179_test_weird_added_space.hrx
rename to spec/non_conformant/scss-tests/179_test_weird_added_space.hrx
diff --git a/spec/scss-tests/180_test_interpolation_with_bracket_on_next_line.hrx b/spec/non_conformant/scss-tests/180_test_interpolation_with_bracket_on_next_line.hrx
similarity index 100%
rename from spec/scss-tests/180_test_interpolation_with_bracket_on_next_line.hrx
rename to spec/non_conformant/scss-tests/180_test_interpolation_with_bracket_on_next_line.hrx
diff --git a/spec/scss-tests/181_test_interpolation.hrx b/spec/non_conformant/scss-tests/181_test_interpolation.hrx
similarity index 100%
rename from spec/scss-tests/181_test_interpolation.hrx
rename to spec/non_conformant/scss-tests/181_test_interpolation.hrx
diff --git a/spec/scss-tests/182_test_mixin_with_keyword_args.hrx b/spec/non_conformant/scss-tests/182_test_mixin_with_keyword_args.hrx
similarity index 100%
rename from spec/scss-tests/182_test_mixin_with_keyword_args.hrx
rename to spec/non_conformant/scss-tests/182_test_mixin_with_keyword_args.hrx
diff --git a/spec/scss-tests/183_test_passing_required_args_as_a_keyword_arg.hrx b/spec/non_conformant/scss-tests/183_test_passing_required_args_as_a_keyword_arg.hrx
similarity index 100%
rename from spec/scss-tests/183_test_passing_required_args_as_a_keyword_arg.hrx
rename to spec/non_conformant/scss-tests/183_test_passing_required_args_as_a_keyword_arg.hrx
diff --git a/spec/scss-tests/184_test_passing_all_as_keyword_args_in_opposite_order.hrx b/spec/non_conformant/scss-tests/184_test_passing_all_as_keyword_args_in_opposite_order.hrx
similarity index 100%
rename from spec/scss-tests/184_test_passing_all_as_keyword_args_in_opposite_order.hrx
rename to spec/non_conformant/scss-tests/184_test_passing_all_as_keyword_args_in_opposite_order.hrx
diff --git a/spec/scss-tests/185_test_keyword_args_in_functions.hrx b/spec/non_conformant/scss-tests/185_test_keyword_args_in_functions.hrx
similarity index 100%
rename from spec/scss-tests/185_test_keyword_args_in_functions.hrx
rename to spec/non_conformant/scss-tests/185_test_keyword_args_in_functions.hrx
diff --git a/spec/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx b/spec/non_conformant/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx
similarity index 100%
rename from spec/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx
rename to spec/non_conformant/scss-tests/186_test_newlines_removed_from_selectors_when_compressed.hrx
diff --git a/spec/scss-tests/187_test_multiline_var.hrx b/spec/non_conformant/scss-tests/187_test_multiline_var.hrx
similarity index 100%
rename from spec/scss-tests/187_test_multiline_var.hrx
rename to spec/non_conformant/scss-tests/187_test_multiline_var.hrx
diff --git a/spec/scss-tests/188_test_mixin_content.hrx b/spec/non_conformant/scss-tests/188_test_mixin_content.hrx
similarity index 100%
rename from spec/scss-tests/188_test_mixin_content.hrx
rename to spec/non_conformant/scss-tests/188_test_mixin_content.hrx
diff --git a/spec/scss-tests/189_test_empty_content.hrx b/spec/non_conformant/scss-tests/189_test_empty_content.hrx
similarity index 100%
rename from spec/scss-tests/189_test_empty_content.hrx
rename to spec/non_conformant/scss-tests/189_test_empty_content.hrx
diff --git a/spec/scss-tests/190_test_options_passed_to_script.hrx b/spec/non_conformant/scss-tests/190_test_options_passed_to_script.hrx
similarity index 100%
rename from spec/scss-tests/190_test_options_passed_to_script.hrx
rename to spec/non_conformant/scss-tests/190_test_options_passed_to_script.hrx
diff --git a/spec/scss-tests/191_test_extend_in_media_in_rule.hrx b/spec/non_conformant/scss-tests/191_test_extend_in_media_in_rule.hrx
similarity index 100%
rename from spec/scss-tests/191_test_extend_in_media_in_rule.hrx
rename to spec/non_conformant/scss-tests/191_test_extend_in_media_in_rule.hrx
diff --git a/spec/scss/almost_ambiguous_nested_rules_and_declarations.hrx b/spec/non_conformant/scss/almost_ambiguous_nested_rules_and_declarations.hrx
similarity index 100%
rename from spec/scss/almost_ambiguous_nested_rules_and_declarations.hrx
rename to spec/non_conformant/scss/almost_ambiguous_nested_rules_and_declarations.hrx
diff --git a/spec/scss/alpha.hrx b/spec/non_conformant/scss/alpha.hrx
similarity index 100%
rename from spec/scss/alpha.hrx
rename to spec/non_conformant/scss/alpha.hrx
diff --git a/spec/scss/arglist.hrx b/spec/non_conformant/scss/arglist.hrx
similarity index 100%
rename from spec/scss/arglist.hrx
rename to spec/non_conformant/scss/arglist.hrx
diff --git a/spec/scss/backrefs-in-selector-groups.hrx b/spec/non_conformant/scss/backrefs-in-selector-groups.hrx
similarity index 100%
rename from spec/scss/backrefs-in-selector-groups.hrx
rename to spec/non_conformant/scss/backrefs-in-selector-groups.hrx
diff --git a/spec/scss/backslash.hrx b/spec/non_conformant/scss/backslash.hrx
similarity index 100%
rename from spec/scss/backslash.hrx
rename to spec/non_conformant/scss/backslash.hrx
diff --git a/spec/scss/basic_function.hrx b/spec/non_conformant/scss/basic_function.hrx
similarity index 100%
rename from spec/scss/basic_function.hrx
rename to spec/non_conformant/scss/basic_function.hrx
diff --git a/spec/scss/basic_mixins.hrx b/spec/non_conformant/scss/basic_mixins.hrx
similarity index 100%
rename from spec/scss/basic_mixins.hrx
rename to spec/non_conformant/scss/basic_mixins.hrx
diff --git a/spec/scss/basic_prop_name_interpolation.hrx b/spec/non_conformant/scss/basic_prop_name_interpolation.hrx
similarity index 100%
rename from spec/scss/basic_prop_name_interpolation.hrx
rename to spec/non_conformant/scss/basic_prop_name_interpolation.hrx
diff --git a/spec/scss/basic_selector_interpolation.hrx b/spec/non_conformant/scss/basic_selector_interpolation.hrx
similarity index 100%
rename from spec/scss/basic_selector_interpolation.hrx
rename to spec/non_conformant/scss/basic_selector_interpolation.hrx
diff --git a/spec/scss/blimp.hrx b/spec/non_conformant/scss/blimp.hrx
similarity index 100%
rename from spec/scss/blimp.hrx
rename to spec/non_conformant/scss/blimp.hrx
diff --git a/spec/scss/block_comment_in_script.hrx b/spec/non_conformant/scss/block_comment_in_script.hrx
similarity index 100%
rename from spec/scss/block_comment_in_script.hrx
rename to spec/non_conformant/scss/block_comment_in_script.hrx
diff --git a/spec/scss/cfunc.hrx b/spec/non_conformant/scss/cfunc.hrx
similarity index 100%
rename from spec/scss/cfunc.hrx
rename to spec/non_conformant/scss/cfunc.hrx
diff --git a/spec/scss/classes-and-ids.hrx b/spec/non_conformant/scss/classes-and-ids.hrx
similarity index 100%
rename from spec/scss/classes-and-ids.hrx
rename to spec/non_conformant/scss/classes-and-ids.hrx
diff --git a/spec/scss/color_output.hrx b/spec/non_conformant/scss/color_output.hrx
similarity index 100%
rename from spec/scss/color_output.hrx
rename to spec/non_conformant/scss/color_output.hrx
diff --git a/spec/scss/comment_after_if_directive.hrx b/spec/non_conformant/scss/comment_after_if_directive.hrx
similarity index 100%
rename from spec/scss/comment_after_if_directive.hrx
rename to spec/non_conformant/scss/comment_after_if_directive.hrx
diff --git a/spec/scss/composed-args.hrx b/spec/non_conformant/scss/composed-args.hrx
similarity index 100%
rename from spec/scss/composed-args.hrx
rename to spec/non_conformant/scss/composed-args.hrx
diff --git a/spec/scss/concat.hrx b/spec/non_conformant/scss/concat.hrx
similarity index 100%
rename from spec/scss/concat.hrx
rename to spec/non_conformant/scss/concat.hrx
diff --git a/spec/scss/cons-up.hrx b/spec/non_conformant/scss/cons-up.hrx
similarity index 100%
rename from spec/scss/cons-up.hrx
rename to spec/non_conformant/scss/cons-up.hrx
diff --git a/spec/scss/css_basic_scss.hrx b/spec/non_conformant/scss/css_basic_scss.hrx
similarity index 100%
rename from spec/scss/css_basic_scss.hrx
rename to spec/non_conformant/scss/css_basic_scss.hrx
diff --git a/spec/scss/css_block_directive_with_semicolon.hrx b/spec/non_conformant/scss/css_block_directive_with_semicolon.hrx
similarity index 100%
rename from spec/scss/css_block_directive_with_semicolon.hrx
rename to spec/non_conformant/scss/css_block_directive_with_semicolon.hrx
diff --git a/spec/scss/css_cdo_and_cdc_ignored_at_toplevel.hrx b/spec/non_conformant/scss/css_cdo_and_cdc_ignored_at_toplevel.hrx
similarity index 100%
rename from spec/scss/css_cdo_and_cdc_ignored_at_toplevel.hrx
rename to spec/non_conformant/scss/css_cdo_and_cdc_ignored_at_toplevel.hrx
diff --git a/spec/scss/css_crazy_comments.hrx b/spec/non_conformant/scss/css_crazy_comments.hrx
similarity index 100%
rename from spec/scss/css_crazy_comments.hrx
rename to spec/non_conformant/scss/css_crazy_comments.hrx
diff --git a/spec/scss/css_empty_declarations.hrx b/spec/non_conformant/scss/css_empty_declarations.hrx
similarity index 100%
rename from spec/scss/css_empty_declarations.hrx
rename to spec/non_conformant/scss/css_empty_declarations.hrx
diff --git a/spec/scss/css_empty_rule.hrx b/spec/non_conformant/scss/css_empty_rule.hrx
similarity index 100%
rename from spec/scss/css_empty_rule.hrx
rename to spec/non_conformant/scss/css_empty_rule.hrx
diff --git a/spec/scss/css_import_directive.hrx b/spec/non_conformant/scss/css_import_directive.hrx
similarity index 100%
rename from spec/scss/css_import_directive.hrx
rename to spec/non_conformant/scss/css_import_directive.hrx
diff --git a/spec/scss/css_invisible_comments.hrx b/spec/non_conformant/scss/css_invisible_comments.hrx
similarity index 100%
rename from spec/scss/css_invisible_comments.hrx
rename to spec/non_conformant/scss/css_invisible_comments.hrx
diff --git a/spec/scss/css_property_comments.hrx b/spec/non_conformant/scss/css_property_comments.hrx
similarity index 100%
rename from spec/scss/css_property_comments.hrx
rename to spec/non_conformant/scss/css_property_comments.hrx
diff --git a/spec/scss/css_rule_comments.hrx b/spec/non_conformant/scss/css_rule_comments.hrx
similarity index 100%
rename from spec/scss/css_rule_comments.hrx
rename to spec/non_conformant/scss/css_rule_comments.hrx
diff --git a/spec/scss/css_selector_comments.hrx b/spec/non_conformant/scss/css_selector_comments.hrx
similarity index 100%
rename from spec/scss/css_selector_comments.hrx
rename to spec/non_conformant/scss/css_selector_comments.hrx
diff --git a/spec/scss/css_selector_hacks.hrx b/spec/non_conformant/scss/css_selector_hacks.hrx
similarity index 100%
rename from spec/scss/css_selector_hacks.hrx
rename to spec/non_conformant/scss/css_selector_hacks.hrx
diff --git a/spec/scss/css_spaceless_combo_selectors.hrx b/spec/non_conformant/scss/css_spaceless_combo_selectors.hrx
similarity index 100%
rename from spec/scss/css_spaceless_combo_selectors.hrx
rename to spec/non_conformant/scss/css_spaceless_combo_selectors.hrx
diff --git a/spec/scss/css_unary_ops.hrx b/spec/non_conformant/scss/css_unary_ops.hrx
similarity index 100%
rename from spec/scss/css_unary_ops.hrx
rename to spec/non_conformant/scss/css_unary_ops.hrx
diff --git a/spec/scss/default-args.hrx b/spec/non_conformant/scss/default-args.hrx
similarity index 100%
rename from spec/scss/default-args.hrx
rename to spec/non_conformant/scss/default-args.hrx
diff --git a/spec/scss/default-parameters.hrx b/spec/non_conformant/scss/default-parameters.hrx
similarity index 100%
rename from spec/scss/default-parameters.hrx
rename to spec/non_conformant/scss/default-parameters.hrx
diff --git a/spec/scss/default-vars-in-default-params.hrx b/spec/non_conformant/scss/default-vars-in-default-params.hrx
similarity index 100%
rename from spec/scss/default-vars-in-default-params.hrx
rename to spec/non_conformant/scss/default-vars-in-default-params.hrx
diff --git a/spec/scss/directives-in-propsets.hrx b/spec/non_conformant/scss/directives-in-propsets.hrx
similarity index 100%
rename from spec/scss/directives-in-propsets.hrx
rename to spec/non_conformant/scss/directives-in-propsets.hrx
diff --git a/spec/scss/each.hrx b/spec/non_conformant/scss/each.hrx
similarity index 100%
rename from spec/scss/each.hrx
rename to spec/non_conformant/scss/each.hrx
diff --git a/spec/scss/each_directive.hrx b/spec/non_conformant/scss/each_directive.hrx
similarity index 100%
rename from spec/scss/each_directive.hrx
rename to spec/non_conformant/scss/each_directive.hrx
diff --git a/spec/scss/each_in_functions.hrx b/spec/non_conformant/scss/each_in_functions.hrx
similarity index 100%
rename from spec/scss/each_in_functions.hrx
rename to spec/non_conformant/scss/each_in_functions.hrx
diff --git a/spec/scss/feature-queries/basic.hrx b/spec/non_conformant/scss/feature-queries/basic.hrx
similarity index 100%
rename from spec/scss/feature-queries/basic.hrx
rename to spec/non_conformant/scss/feature-queries/basic.hrx
diff --git a/spec/scss/feature-queries/nested.hrx b/spec/non_conformant/scss/feature-queries/nested.hrx
similarity index 100%
rename from spec/scss/feature-queries/nested.hrx
rename to spec/non_conformant/scss/feature-queries/nested.hrx
diff --git a/spec/scss/feature-queries/without-query.hrx b/spec/non_conformant/scss/feature-queries/without-query.hrx
similarity index 100%
rename from spec/scss/feature-queries/without-query.hrx
rename to spec/non_conformant/scss/feature-queries/without-query.hrx
diff --git a/spec/scss/for.hrx b/spec/non_conformant/scss/for.hrx
similarity index 100%
rename from spec/scss/for.hrx
rename to spec/non_conformant/scss/for.hrx
diff --git a/spec/scss/for_directive.hrx b/spec/non_conformant/scss/for_directive.hrx
similarity index 100%
rename from spec/scss/for_directive.hrx
rename to spec/non_conformant/scss/for_directive.hrx
diff --git a/spec/scss/for_in_functions.hrx b/spec/non_conformant/scss/for_in_functions.hrx
similarity index 100%
rename from spec/scss/for_in_functions.hrx
rename to spec/non_conformant/scss/for_in_functions.hrx
diff --git a/spec/scss/function-names.hrx b/spec/non_conformant/scss/function-names.hrx
similarity index 100%
rename from spec/scss/function-names.hrx
rename to spec/non_conformant/scss/function-names.hrx
diff --git a/spec/scss/function_args.hrx b/spec/non_conformant/scss/function_args.hrx
similarity index 100%
rename from spec/scss/function_args.hrx
rename to spec/non_conformant/scss/function_args.hrx
diff --git a/spec/scss/functions-and-mixins.hrx b/spec/non_conformant/scss/functions-and-mixins.hrx
similarity index 100%
rename from spec/scss/functions-and-mixins.hrx
rename to spec/non_conformant/scss/functions-and-mixins.hrx
diff --git a/spec/scss/functions.hrx b/spec/non_conformant/scss/functions.hrx
similarity index 100%
rename from spec/scss/functions.hrx
rename to spec/non_conformant/scss/functions.hrx
diff --git a/spec/scss/guard_assign.hrx b/spec/non_conformant/scss/guard_assign.hrx
similarity index 100%
rename from spec/scss/guard_assign.hrx
rename to spec/non_conformant/scss/guard_assign.hrx
diff --git a/spec/scss/hey1.hrx b/spec/non_conformant/scss/hey1.hrx
similarity index 100%
rename from spec/scss/hey1.hrx
rename to spec/non_conformant/scss/hey1.hrx
diff --git a/spec/scss/hey2.hrx b/spec/non_conformant/scss/hey2.hrx
similarity index 100%
rename from spec/scss/hey2.hrx
rename to spec/non_conformant/scss/hey2.hrx
diff --git a/spec/scss/huge.hrx b/spec/non_conformant/scss/huge.hrx
similarity index 100%
rename from spec/scss/huge.hrx
rename to spec/non_conformant/scss/huge.hrx
diff --git a/spec/scss/hyphen-interpolated.hrx b/spec/non_conformant/scss/hyphen-interpolated.hrx
similarity index 100%
rename from spec/scss/hyphen-interpolated.hrx
rename to spec/non_conformant/scss/hyphen-interpolated.hrx
diff --git a/spec/scss/ie-backslash.hrx b/spec/non_conformant/scss/ie-backslash.hrx
similarity index 100%
rename from spec/scss/ie-backslash.hrx
rename to spec/non_conformant/scss/ie-backslash.hrx
diff --git a/spec/scss/ie-functions.hrx b/spec/non_conformant/scss/ie-functions.hrx
similarity index 100%
rename from spec/scss/ie-functions.hrx
rename to spec/non_conformant/scss/ie-functions.hrx
diff --git a/spec/scss/if-in-mixin.hrx b/spec/non_conformant/scss/if-in-mixin.hrx
similarity index 100%
rename from spec/scss/if-in-mixin.hrx
rename to spec/non_conformant/scss/if-in-mixin.hrx
diff --git a/spec/scss/if-in-propset.hrx b/spec/non_conformant/scss/if-in-propset.hrx
similarity index 100%
rename from spec/scss/if-in-propset.hrx
rename to spec/non_conformant/scss/if-in-propset.hrx
diff --git a/spec/scss/if.hrx b/spec/non_conformant/scss/if.hrx
similarity index 100%
rename from spec/scss/if.hrx
rename to spec/non_conformant/scss/if.hrx
diff --git a/spec/scss/if_directive.hrx b/spec/non_conformant/scss/if_directive.hrx
similarity index 100%
rename from spec/scss/if_directive.hrx
rename to spec/non_conformant/scss/if_directive.hrx
diff --git a/spec/scss/imp.hrx b/spec/non_conformant/scss/imp.hrx
similarity index 100%
rename from spec/scss/imp.hrx
rename to spec/non_conformant/scss/imp.hrx
diff --git a/spec/scss/important-in-arglist.hrx b/spec/non_conformant/scss/important-in-arglist.hrx
similarity index 100%
rename from spec/scss/important-in-arglist.hrx
rename to spec/non_conformant/scss/important-in-arglist.hrx
diff --git a/spec/scss/important.hrx b/spec/non_conformant/scss/important.hrx
similarity index 100%
rename from spec/scss/important.hrx
rename to spec/non_conformant/scss/important.hrx
diff --git a/spec/scss/interpolated-selectors.hrx b/spec/non_conformant/scss/interpolated-selectors.hrx
similarity index 100%
rename from spec/scss/interpolated-selectors.hrx
rename to spec/non_conformant/scss/interpolated-selectors.hrx
diff --git a/spec/scss/interpolated-strings.hrx b/spec/non_conformant/scss/interpolated-strings.hrx
similarity index 100%
rename from spec/scss/interpolated-strings.hrx
rename to spec/non_conformant/scss/interpolated-strings.hrx
diff --git a/spec/scss/interpolation-operators-precedence.hrx b/spec/non_conformant/scss/interpolation-operators-precedence.hrx
similarity index 100%
rename from spec/scss/interpolation-operators-precedence.hrx
rename to spec/non_conformant/scss/interpolation-operators-precedence.hrx
diff --git a/spec/scss/interpolation.hrx b/spec/non_conformant/scss/interpolation.hrx
similarity index 100%
rename from spec/scss/interpolation.hrx
rename to spec/non_conformant/scss/interpolation.hrx
diff --git a/spec/scss/interpolation_with_bracket_on_next_line.hrx b/spec/non_conformant/scss/interpolation_with_bracket_on_next_line.hrx
similarity index 100%
rename from spec/scss/interpolation_with_bracket_on_next_line.hrx
rename to spec/non_conformant/scss/interpolation_with_bracket_on_next_line.hrx
diff --git a/spec/scss/keyword_args_in_functions.hrx b/spec/non_conformant/scss/keyword_args_in_functions.hrx
similarity index 100%
rename from spec/scss/keyword_args_in_functions.hrx
rename to spec/non_conformant/scss/keyword_args_in_functions.hrx
diff --git a/spec/scss/lang.hrx b/spec/non_conformant/scss/lang.hrx
similarity index 100%
rename from spec/scss/lang.hrx
rename to spec/non_conformant/scss/lang.hrx
diff --git a/spec/scss/line_comment_in_script.hrx b/spec/non_conformant/scss/line_comment_in_script.hrx
similarity index 100%
rename from spec/scss/line_comment_in_script.hrx
rename to spec/non_conformant/scss/line_comment_in_script.hrx
diff --git a/spec/scss/long-selector.hrx b/spec/non_conformant/scss/long-selector.hrx
similarity index 100%
rename from spec/scss/long-selector.hrx
rename to spec/non_conformant/scss/long-selector.hrx
diff --git a/spec/scss/media/interpolated.hrx b/spec/non_conformant/scss/media/interpolated.hrx
similarity index 100%
rename from spec/scss/media/interpolated.hrx
rename to spec/non_conformant/scss/media/interpolated.hrx
diff --git a/spec/scss/media/nesting/merged.hrx b/spec/non_conformant/scss/media/nesting/merged.hrx
similarity index 100%
rename from spec/scss/media/nesting/merged.hrx
rename to spec/non_conformant/scss/media/nesting/merged.hrx
diff --git a/spec/scss/media/nesting/merged_and_retained.hrx b/spec/non_conformant/scss/media/nesting/merged_and_retained.hrx
similarity index 100%
rename from spec/scss/media/nesting/merged_and_retained.hrx
rename to spec/non_conformant/scss/media/nesting/merged_and_retained.hrx
diff --git a/spec/scss/media/nesting/removed.hrx b/spec/non_conformant/scss/media/nesting/removed.hrx
similarity index 100%
rename from spec/scss/media/nesting/removed.hrx
rename to spec/non_conformant/scss/media/nesting/removed.hrx
diff --git a/spec/scss/media/nesting/retained.hrx b/spec/non_conformant/scss/media/nesting/retained.hrx
similarity index 100%
rename from spec/scss/media/nesting/retained.hrx
rename to spec/non_conformant/scss/media/nesting/retained.hrx
diff --git a/spec/scss/media/script_features.hrx b/spec/non_conformant/scss/media/script_features.hrx
similarity index 100%
rename from spec/scss/media/script_features.hrx
rename to spec/non_conformant/scss/media/script_features.hrx
diff --git a/spec/scss/mixin-content-selectors.hrx b/spec/non_conformant/scss/mixin-content-selectors.hrx
similarity index 100%
rename from spec/scss/mixin-content-selectors.hrx
rename to spec/non_conformant/scss/mixin-content-selectors.hrx
diff --git a/spec/scss/mixin-content-with-no-block.hrx b/spec/non_conformant/scss/mixin-content-with-no-block.hrx
similarity index 100%
rename from spec/scss/mixin-content-with-no-block.hrx
rename to spec/non_conformant/scss/mixin-content-with-no-block.hrx
diff --git a/spec/scss/mixin-content.hrx b/spec/non_conformant/scss/mixin-content.hrx
similarity index 100%
rename from spec/scss/mixin-content.hrx
rename to spec/non_conformant/scss/mixin-content.hrx
diff --git a/spec/scss/mixin_with_keyword_args.hrx b/spec/non_conformant/scss/mixin_with_keyword_args.hrx
similarity index 100%
rename from spec/scss/mixin_with_keyword_args.hrx
rename to spec/non_conformant/scss/mixin_with_keyword_args.hrx
diff --git a/spec/scss/mixins_with_args.hrx b/spec/non_conformant/scss/mixins_with_args.hrx
similarity index 100%
rename from spec/scss/mixins_with_args.hrx
rename to spec/non_conformant/scss/mixins_with_args.hrx
diff --git a/spec/scss/mixins_with_empty_args.hrx b/spec/non_conformant/scss/mixins_with_empty_args.hrx
similarity index 100%
rename from spec/scss/mixins_with_empty_args.hrx
rename to spec/non_conformant/scss/mixins_with_empty_args.hrx
diff --git a/spec/scss/multiline-var.hrx b/spec/non_conformant/scss/multiline-var.hrx
similarity index 100%
rename from spec/scss/multiline-var.hrx
rename to spec/non_conformant/scss/multiline-var.hrx
diff --git a/spec/scss/multiline_var.hrx b/spec/non_conformant/scss/multiline_var.hrx
similarity index 100%
rename from spec/scss/multiline_var.hrx
rename to spec/non_conformant/scss/multiline_var.hrx
diff --git a/spec/scss/multiple-operators.hrx b/spec/non_conformant/scss/multiple-operators.hrx
similarity index 100%
rename from spec/scss/multiple-operators.hrx
rename to spec/non_conformant/scss/multiple-operators.hrx
diff --git a/spec/scss/namespace_properties.hrx b/spec/non_conformant/scss/namespace_properties.hrx
similarity index 100%
rename from spec/scss/namespace_properties.hrx
rename to spec/non_conformant/scss/namespace_properties.hrx
diff --git a/spec/scss/namespace_properties_with_value.hrx b/spec/non_conformant/scss/namespace_properties_with_value.hrx
similarity index 100%
rename from spec/scss/namespace_properties_with_value.hrx
rename to spec/non_conformant/scss/namespace_properties_with_value.hrx
diff --git a/spec/scss/negation.hrx b/spec/non_conformant/scss/negation.hrx
similarity index 100%
rename from spec/scss/negation.hrx
rename to spec/non_conformant/scss/negation.hrx
diff --git a/spec/scss/nested-extend.hrx b/spec/non_conformant/scss/nested-extend.hrx
similarity index 100%
rename from spec/scss/nested-extend.hrx
rename to spec/non_conformant/scss/nested-extend.hrx
diff --git a/spec/scss/nested_namespace_properties.hrx b/spec/non_conformant/scss/nested_namespace_properties.hrx
similarity index 100%
rename from spec/scss/nested_namespace_properties.hrx
rename to spec/non_conformant/scss/nested_namespace_properties.hrx
diff --git a/spec/scss/nested_rules.hrx b/spec/non_conformant/scss/nested_rules.hrx
similarity index 100%
rename from spec/scss/nested_rules.hrx
rename to spec/non_conformant/scss/nested_rules.hrx
diff --git a/spec/scss/nested_rules_with_declarations.hrx b/spec/non_conformant/scss/nested_rules_with_declarations.hrx
similarity index 100%
rename from spec/scss/nested_rules_with_declarations.hrx
rename to spec/non_conformant/scss/nested_rules_with_declarations.hrx
diff --git a/spec/scss/nested_rules_with_fancy_selectors.hrx b/spec/non_conformant/scss/nested_rules_with_fancy_selectors.hrx
similarity index 100%
rename from spec/scss/nested_rules_with_fancy_selectors.hrx
rename to spec/non_conformant/scss/nested_rules_with_fancy_selectors.hrx
diff --git a/spec/scss/newlines_in_selectors.hrx b/spec/non_conformant/scss/newlines_in_selectors.hrx
similarity index 100%
rename from spec/scss/newlines_in_selectors.hrx
rename to spec/non_conformant/scss/newlines_in_selectors.hrx
diff --git a/spec/scss/no_namespace_properties_without_space.hrx b/spec/non_conformant/scss/no_namespace_properties_without_space.hrx
similarity index 100%
rename from spec/scss/no_namespace_properties_without_space.hrx
rename to spec/non_conformant/scss/no_namespace_properties_without_space.hrx
diff --git a/spec/scss/null.hrx b/spec/non_conformant/scss/null.hrx
similarity index 100%
rename from spec/scss/null.hrx
rename to spec/non_conformant/scss/null.hrx
diff --git a/spec/scss/numbers.hrx b/spec/non_conformant/scss/numbers.hrx
similarity index 100%
rename from spec/scss/numbers.hrx
rename to spec/non_conformant/scss/numbers.hrx
diff --git a/spec/scss/one_line_comments.hrx b/spec/non_conformant/scss/one_line_comments.hrx
similarity index 100%
rename from spec/scss/one_line_comments.hrx
rename to spec/non_conformant/scss/one_line_comments.hrx
diff --git a/spec/scss/parent_selectors.hrx b/spec/non_conformant/scss/parent_selectors.hrx
similarity index 100%
rename from spec/scss/parent_selectors.hrx
rename to spec/non_conformant/scss/parent_selectors.hrx
diff --git a/spec/scss/passing_all_as_keyword_args_in_opposite_order.hrx b/spec/non_conformant/scss/passing_all_as_keyword_args_in_opposite_order.hrx
similarity index 100%
rename from spec/scss/passing_all_as_keyword_args_in_opposite_order.hrx
rename to spec/non_conformant/scss/passing_all_as_keyword_args_in_opposite_order.hrx
diff --git a/spec/scss/passing_required_args_as_a_keyword_arg.hrx b/spec/non_conformant/scss/passing_required_args_as_a_keyword_arg.hrx
similarity index 100%
rename from spec/scss/passing_required_args_as_a_keyword_arg.hrx
rename to spec/non_conformant/scss/passing_required_args_as_a_keyword_arg.hrx
diff --git a/spec/scss/percentages.hrx b/spec/non_conformant/scss/percentages.hrx
similarity index 100%
rename from spec/scss/percentages.hrx
rename to spec/non_conformant/scss/percentages.hrx
diff --git a/spec/scss/placeholder-with-media.hrx b/spec/non_conformant/scss/placeholder-with-media.hrx
similarity index 100%
rename from spec/scss/placeholder-with-media.hrx
rename to spec/non_conformant/scss/placeholder-with-media.hrx
diff --git a/spec/scss/placeholder.hrx b/spec/non_conformant/scss/placeholder.hrx
similarity index 100%
rename from spec/scss/placeholder.hrx
rename to spec/non_conformant/scss/placeholder.hrx
diff --git a/spec/scss/precision.hrx b/spec/non_conformant/scss/precision.hrx
similarity index 100%
rename from spec/scss/precision.hrx
rename to spec/non_conformant/scss/precision.hrx
diff --git a/spec/scss/prop_name_interpolation_after_hyphen.hrx b/spec/non_conformant/scss/prop_name_interpolation_after_hyphen.hrx
similarity index 100%
rename from spec/scss/prop_name_interpolation_after_hyphen.hrx
rename to spec/non_conformant/scss/prop_name_interpolation_after_hyphen.hrx
diff --git a/spec/scss/prop_name_only_interpolation.hrx b/spec/non_conformant/scss/prop_name_only_interpolation.hrx
similarity index 100%
rename from spec/scss/prop_name_only_interpolation.hrx
rename to spec/non_conformant/scss/prop_name_only_interpolation.hrx
diff --git a/spec/scss/property_interpolation_at_dashes.hrx b/spec/non_conformant/scss/property_interpolation_at_dashes.hrx
similarity index 100%
rename from spec/scss/property_interpolation_at_dashes.hrx
rename to spec/non_conformant/scss/property_interpolation_at_dashes.hrx
diff --git a/spec/scss/quotes-in-interpolated-strings.hrx b/spec/non_conformant/scss/quotes-in-interpolated-strings.hrx
similarity index 100%
rename from spec/scss/quotes-in-interpolated-strings.hrx
rename to spec/non_conformant/scss/quotes-in-interpolated-strings.hrx
diff --git a/spec/scss/retina-image.hrx b/spec/non_conformant/scss/retina-image.hrx
similarity index 100%
rename from spec/scss/retina-image.hrx
rename to spec/non_conformant/scss/retina-image.hrx
diff --git a/spec/scss/sass_script.hrx b/spec/non_conformant/scss/sass_script.hrx
similarity index 100%
rename from spec/scss/sass_script.hrx
rename to spec/non_conformant/scss/sass_script.hrx
diff --git a/spec/scss/selector_interpolation_at_attr_beginning.hrx b/spec/non_conformant/scss/selector_interpolation_at_attr_beginning.hrx
similarity index 100%
rename from spec/scss/selector_interpolation_at_attr_beginning.hrx
rename to spec/non_conformant/scss/selector_interpolation_at_attr_beginning.hrx
diff --git a/spec/scss/selector_interpolation_at_class_begininng.hrx b/spec/non_conformant/scss/selector_interpolation_at_class_begininng.hrx
similarity index 100%
rename from spec/scss/selector_interpolation_at_class_begininng.hrx
rename to spec/non_conformant/scss/selector_interpolation_at_class_begininng.hrx
diff --git a/spec/scss/selector_interpolation_at_id_begininng.hrx b/spec/non_conformant/scss/selector_interpolation_at_id_begininng.hrx
similarity index 100%
rename from spec/scss/selector_interpolation_at_id_begininng.hrx
rename to spec/non_conformant/scss/selector_interpolation_at_id_begininng.hrx
diff --git a/spec/scss/selector_interpolation_at_pseudo_begininng.hrx b/spec/non_conformant/scss/selector_interpolation_at_pseudo_begininng.hrx
similarity index 100%
rename from spec/scss/selector_interpolation_at_pseudo_begininng.hrx
rename to spec/non_conformant/scss/selector_interpolation_at_pseudo_begininng.hrx
diff --git a/spec/scss/selector_interpolation_in_pseudoclass.hrx b/spec/non_conformant/scss/selector_interpolation_in_pseudoclass.hrx
similarity index 100%
rename from spec/scss/selector_interpolation_in_pseudoclass.hrx
rename to spec/non_conformant/scss/selector_interpolation_in_pseudoclass.hrx
diff --git a/spec/scss/several_namespace_properties.hrx b/spec/non_conformant/scss/several_namespace_properties.hrx
similarity index 100%
rename from spec/scss/several_namespace_properties.hrx
rename to spec/non_conformant/scss/several_namespace_properties.hrx
diff --git a/spec/scss/simple-inheritance.hrx b/spec/non_conformant/scss/simple-inheritance.hrx
similarity index 100%
rename from spec/scss/simple-inheritance.hrx
rename to spec/non_conformant/scss/simple-inheritance.hrx
diff --git a/spec/scss/simple-lists.hrx b/spec/non_conformant/scss/simple-lists.hrx
similarity index 100%
rename from spec/scss/simple-lists.hrx
rename to spec/non_conformant/scss/simple-lists.hrx
diff --git a/spec/scss/star_plus_and_parent.hrx b/spec/non_conformant/scss/star_plus_and_parent.hrx
similarity index 100%
rename from spec/scss/star_plus_and_parent.hrx
rename to spec/non_conformant/scss/star_plus_and_parent.hrx
diff --git a/spec/scss/strings.hrx b/spec/non_conformant/scss/strings.hrx
similarity index 100%
rename from spec/scss/strings.hrx
rename to spec/non_conformant/scss/strings.hrx
diff --git a/spec/scss/url_import.hrx b/spec/non_conformant/scss/url_import.hrx
similarity index 100%
rename from spec/scss/url_import.hrx
rename to spec/non_conformant/scss/url_import.hrx
diff --git a/spec/scss/variables.hrx b/spec/non_conformant/scss/variables.hrx
similarity index 100%
rename from spec/scss/variables.hrx
rename to spec/non_conformant/scss/variables.hrx
diff --git a/spec/scss/vars.hrx b/spec/non_conformant/scss/vars.hrx
similarity index 100%
rename from spec/scss/vars.hrx
rename to spec/non_conformant/scss/vars.hrx
diff --git a/spec/scss/weird-selectors.hrx b/spec/non_conformant/scss/weird-selectors.hrx
similarity index 100%
rename from spec/scss/weird-selectors.hrx
rename to spec/non_conformant/scss/weird-selectors.hrx
diff --git a/spec/scss/weird_added_space.hrx b/spec/non_conformant/scss/weird_added_space.hrx
similarity index 100%
rename from spec/scss/weird_added_space.hrx
rename to spec/non_conformant/scss/weird_added_space.hrx
diff --git a/spec/scss/while.hrx b/spec/non_conformant/scss/while.hrx
similarity index 100%
rename from spec/scss/while.hrx
rename to spec/non_conformant/scss/while.hrx
diff --git a/spec/scss/while_directive.hrx b/spec/non_conformant/scss/while_directive.hrx
similarity index 100%
rename from spec/scss/while_directive.hrx
rename to spec/non_conformant/scss/while_directive.hrx
diff --git a/spec/scss/while_in_functions.hrx b/spec/non_conformant/scss/while_in_functions.hrx
similarity index 100%
rename from spec/scss/while_in_functions.hrx
rename to spec/non_conformant/scss/while_in_functions.hrx
diff --git a/spec/scss/while_without_condition.hrx b/spec/non_conformant/scss/while_without_condition.hrx
similarity index 100%
rename from spec/scss/while_without_condition.hrx
rename to spec/non_conformant/scss/while_without_condition.hrx
diff --git a/spec/scss/zero-compression.hrx b/spec/non_conformant/scss/zero-compression.hrx
similarity index 100%
rename from spec/scss/zero-compression.hrx
rename to spec/non_conformant/scss/zero-compression.hrx
diff --git a/spec/selectors/attribute.hrx b/spec/non_conformant/selectors/attribute.hrx
similarity index 100%
rename from spec/selectors/attribute.hrx
rename to spec/non_conformant/selectors/attribute.hrx
diff --git a/spec/selectors/placeholder_in_pseudo.hrx b/spec/non_conformant/selectors/placeholder_in_pseudo.hrx
similarity index 100%
rename from spec/selectors/placeholder_in_pseudo.hrx
rename to spec/non_conformant/selectors/placeholder_in_pseudo.hrx
diff --git a/spec/variables.hrx b/spec/non_conformant/variables.hrx
similarity index 100%
rename from spec/variables.hrx
rename to spec/non_conformant/variables.hrx
diff --git a/spec/test.scss b/spec/test.scss
deleted file mode 100644
index e0182cb91b..0000000000
--- a/spec/test.scss
+++ /dev/null
@@ -1 +0,0 @@
-a{b:c}