diff --git a/spec/libsass-todo-tests/38_expressions_in_at_directives/expected.compact.css b/spec/basic/38_expressions_in_at_directives/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/38_expressions_in_at_directives/expected.compact.css
rename to spec/basic/38_expressions_in_at_directives/expected.compact.css
diff --git a/spec/basic/38_expressions_in_at_directives/expected.compressed.css b/spec/basic/38_expressions_in_at_directives/expected.compressed.css
new file mode 100644
index 0000000000..fd86eaca86
--- /dev/null
+++ b/spec/basic/38_expressions_in_at_directives/expected.compressed.css
@@ -0,0 +1 @@
+@foo $x $y,hux{bar{whatever:whatever}}
diff --git a/spec/libsass-todo-tests/38_expressions_in_at_directives/expected.expanded.css b/spec/basic/38_expressions_in_at_directives/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/38_expressions_in_at_directives/expected.expanded.css
rename to spec/basic/38_expressions_in_at_directives/expected.expanded.css
diff --git a/spec/libsass-todo-tests/38_expressions_in_at_directives/expected_output.css b/spec/basic/38_expressions_in_at_directives/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/38_expressions_in_at_directives/expected_output.css
rename to spec/basic/38_expressions_in_at_directives/expected_output.css
diff --git a/spec/libsass-todo-tests/38_expressions_in_at_directives/input.scss b/spec/basic/38_expressions_in_at_directives/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/38_expressions_in_at_directives/input.scss
rename to spec/basic/38_expressions_in_at_directives/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected.compact.css b/spec/extend-tests/021_test_universal_unification_with_simple_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected.compact.css
rename to spec/extend-tests/021_test_universal_unification_with_simple_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected.compressed.css b/spec/extend-tests/021_test_universal_unification_with_simple_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected.compressed.css
rename to spec/extend-tests/021_test_universal_unification_with_simple_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected.expanded.css b/spec/extend-tests/021_test_universal_unification_with_simple_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected.expanded.css
rename to spec/extend-tests/021_test_universal_unification_with_simple_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected_output.css b/spec/extend-tests/021_test_universal_unification_with_simple_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/expected_output.css
rename to spec/extend-tests/021_test_universal_unification_with_simple_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/input.scss b/spec/extend-tests/021_test_universal_unification_with_simple_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/021_test_universal_unification_with_simple_target/input.scss
rename to spec/extend-tests/021_test_universal_unification_with_simple_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected.compact.css b/spec/extend-tests/023_test_universal_unification_with_simple_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected.compact.css
rename to spec/extend-tests/023_test_universal_unification_with_simple_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected.compressed.css b/spec/extend-tests/023_test_universal_unification_with_simple_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected.compressed.css
rename to spec/extend-tests/023_test_universal_unification_with_simple_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected.expanded.css b/spec/extend-tests/023_test_universal_unification_with_simple_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected.expanded.css
rename to spec/extend-tests/023_test_universal_unification_with_simple_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected_output.css b/spec/extend-tests/023_test_universal_unification_with_simple_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/expected_output.css
rename to spec/extend-tests/023_test_universal_unification_with_simple_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/input.scss b/spec/extend-tests/023_test_universal_unification_with_simple_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/023_test_universal_unification_with_simple_target/input.scss
rename to spec/extend-tests/023_test_universal_unification_with_simple_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compact.css b/spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compact.css
rename to spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css b/spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css
rename to spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css b/spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css
rename to spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected_output.css b/spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected_output.css
rename to spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/input.scss b/spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/input.scss
rename to spec/extend-tests/026_test_universal_unification_with_namespaceless_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compact.css b/spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compact.css
rename to spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css b/spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css
rename to spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css b/spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css
rename to spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected_output.css b/spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected_output.css
rename to spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/input.scss b/spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/input.scss
rename to spec/extend-tests/028_test_universal_unification_with_namespaceless_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compact.css b/spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compact.css
rename to spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compressed.css b/spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
rename to spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.expanded.css b/spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
rename to spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected_output.css b/spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected_output.css
rename to spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/input.scss b/spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/031_test_universal_unification_with_namespaced_universal_target/input.scss
rename to spec/extend-tests/031_test_universal_unification_with_namespaced_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compact.css b/spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compact.css
rename to spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compressed.css b/spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
rename to spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.expanded.css b/spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
rename to spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected_output.css b/spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected_output.css
rename to spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/input.scss b/spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/032_test_universal_unification_with_namespaced_universal_target/input.scss
rename to spec/extend-tests/032_test_universal_unification_with_namespaced_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compact.css b/spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compact.css
rename to spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compressed.css b/spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
rename to spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.expanded.css b/spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
rename to spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected_output.css b/spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected_output.css
rename to spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/input.scss b/spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/033_test_universal_unification_with_namespaced_universal_target/input.scss
rename to spec/extend-tests/033_test_universal_unification_with_namespaced_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compact.css b/spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compact.css
rename to spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compressed.css b/spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compressed.css
rename to spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.expanded.css b/spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.expanded.css
rename to spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected_output.css b/spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected_output.css
rename to spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/input.scss b/spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/035_test_universal_unification_with_namespaceless_element_target/input.scss
rename to spec/extend-tests/035_test_universal_unification_with_namespaceless_element_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compact.css b/spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compact.css
rename to spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compressed.css b/spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compressed.css
rename to spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.expanded.css b/spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.expanded.css
rename to spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected_output.css b/spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected_output.css
rename to spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/input.scss b/spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/037_test_universal_unification_with_namespaceless_element_target/input.scss
rename to spec/extend-tests/037_test_universal_unification_with_namespaceless_element_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compact.css b/spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compact.css
rename to spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compressed.css b/spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compressed.css
rename to spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.expanded.css b/spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.expanded.css
rename to spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected_output.css b/spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected_output.css
rename to spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/input.scss b/spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/041_test_universal_unification_with_namespaced_element_target/input.scss
rename to spec/extend-tests/041_test_universal_unification_with_namespaced_element_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compact.css b/spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compact.css
rename to spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compressed.css b/spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compressed.css
rename to spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.expanded.css b/spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.expanded.css
rename to spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected_output.css b/spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected_output.css
rename to spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/input.scss b/spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/042_test_universal_unification_with_namespaced_element_target/input.scss
rename to spec/extend-tests/042_test_universal_unification_with_namespaced_element_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compact.css b/spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compact.css
rename to spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compressed.css b/spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
rename to spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.expanded.css b/spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
rename to spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected_output.css b/spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected_output.css
rename to spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/input.scss b/spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/049_test_element_unification_with_namespaceless_universal_target/input.scss
rename to spec/extend-tests/049_test_element_unification_with_namespaceless_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compact.css b/spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compact.css
rename to spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compressed.css b/spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
rename to spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.expanded.css b/spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
rename to spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected_output.css b/spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected_output.css
rename to spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/input.scss b/spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/050_test_element_unification_with_namespaceless_universal_target/input.scss
rename to spec/extend-tests/050_test_element_unification_with_namespaceless_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compact.css b/spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compact.css
rename to spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compressed.css b/spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
rename to spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.expanded.css b/spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
rename to spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected_output.css b/spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected_output.css
rename to spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/input.scss b/spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/052_test_element_unification_with_namespaceless_universal_target/input.scss
rename to spec/extend-tests/052_test_element_unification_with_namespaceless_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compact.css b/spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compact.css
rename to spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compressed.css b/spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compressed.css
rename to spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.expanded.css b/spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.expanded.css
rename to spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected_output.css b/spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected_output.css
rename to spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/input.scss b/spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/055_test_element_unification_with_namespaced_universal_target/input.scss
rename to spec/extend-tests/055_test_element_unification_with_namespaced_universal_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compact.css b/spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compact.css
rename to spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compressed.css b/spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compressed.css
rename to spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.expanded.css b/spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.expanded.css
rename to spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected_output.css b/spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected_output.css
rename to spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/input.scss b/spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/057_test_element_unification_with_namespaceless_element_target/input.scss
rename to spec/extend-tests/057_test_element_unification_with_namespaceless_element_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compact.css b/spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compact.css
rename to spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compressed.css b/spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compressed.css
rename to spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.expanded.css b/spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.expanded.css
rename to spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected_output.css b/spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/expected_output.css
rename to spec/extend-tests/062_test_element_unification_with_namespaced_element_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/input.scss b/spec/extend-tests/062_test_element_unification_with_namespaced_element_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/062_test_element_unification_with_namespaced_element_target/input.scss
rename to spec/extend-tests/062_test_element_unification_with_namespaced_element_target/input.scss
diff --git a/spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compact.css b/spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compact.css
rename to spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compact.css
diff --git a/spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compressed.css b/spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compressed.css
rename to spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.compressed.css
diff --git a/spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.expanded.css b/spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.expanded.css
rename to spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected.expanded.css
diff --git a/spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected_output.css b/spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/expected_output.css
rename to spec/extend-tests/063_test_element_unification_with_namespaced_element_target/expected_output.css
diff --git a/spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/input.scss b/spec/extend-tests/063_test_element_unification_with_namespaced_element_target/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/extend-tests/063_test_element_unification_with_namespaced_element_target/input.scss
rename to spec/extend-tests/063_test_element_unification_with_namespaced_element_target/input.scss
diff --git a/spec/libsass-todo-issues/issue_1043/expected.compact.css b/spec/libsass-closed-issues/issue_1043/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1043/expected.compact.css
rename to spec/libsass-closed-issues/issue_1043/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1043/expected.compressed.css b/spec/libsass-closed-issues/issue_1043/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1043/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1043/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1043/expected.expanded.css b/spec/libsass-closed-issues/issue_1043/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1043/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1043/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1043/expected_output.css b/spec/libsass-closed-issues/issue_1043/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1043/expected_output.css
rename to spec/libsass-closed-issues/issue_1043/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1043/input.scss b/spec/libsass-closed-issues/issue_1043/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1043/input.scss
rename to spec/libsass-closed-issues/issue_1043/input.scss
diff --git a/spec/libsass-todo-issues/issue_1061/expected.compact.css b/spec/libsass-closed-issues/issue_1061/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1061/expected.compact.css
rename to spec/libsass-closed-issues/issue_1061/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1061/expected.compressed.css b/spec/libsass-closed-issues/issue_1061/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1061/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1061/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1061/expected.expanded.css b/spec/libsass-closed-issues/issue_1061/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1061/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1061/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1061/expected_output.css b/spec/libsass-closed-issues/issue_1061/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1061/expected_output.css
rename to spec/libsass-closed-issues/issue_1061/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1061/input.scss b/spec/libsass-closed-issues/issue_1061/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1061/input.scss
rename to spec/libsass-closed-issues/issue_1061/input.scss
diff --git a/spec/libsass-todo-issues/issue_1170/eval/expected.compact.css b/spec/libsass-closed-issues/issue_1170/eval/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/eval/expected.compact.css
rename to spec/libsass-closed-issues/issue_1170/eval/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1170/eval/expected.compressed.css b/spec/libsass-closed-issues/issue_1170/eval/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/eval/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1170/eval/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1170/eval/expected.expanded.css b/spec/libsass-closed-issues/issue_1170/eval/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/eval/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1170/eval/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1170/eval/expected_output.css b/spec/libsass-closed-issues/issue_1170/eval/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/eval/expected_output.css
rename to spec/libsass-closed-issues/issue_1170/eval/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1170/eval/input.scss b/spec/libsass-closed-issues/issue_1170/eval/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/eval/input.scss
rename to spec/libsass-closed-issues/issue_1170/eval/input.scss
diff --git a/spec/libsass-todo-issues/issue_1170/parse/expected.compact.css b/spec/libsass-closed-issues/issue_1170/parse/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/parse/expected.compact.css
rename to spec/libsass-closed-issues/issue_1170/parse/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1170/parse/expected.compressed.css b/spec/libsass-closed-issues/issue_1170/parse/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/parse/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1170/parse/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1170/parse/expected.expanded.css b/spec/libsass-closed-issues/issue_1170/parse/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/parse/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1170/parse/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1170/parse/expected_output.css b/spec/libsass-closed-issues/issue_1170/parse/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/parse/expected_output.css
rename to spec/libsass-closed-issues/issue_1170/parse/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1170/parse/input.scss b/spec/libsass-closed-issues/issue_1170/parse/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1170/parse/input.scss
rename to spec/libsass-closed-issues/issue_1170/parse/input.scss
diff --git a/spec/libsass-todo-issues/issue_1207/expected.compact.css b/spec/libsass-closed-issues/issue_1207/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1207/expected.compact.css
rename to spec/libsass-closed-issues/issue_1207/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1207/expected.compressed.css b/spec/libsass-closed-issues/issue_1207/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1207/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1207/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1207/expected.expanded.css b/spec/libsass-closed-issues/issue_1207/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1207/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1207/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1207/expected_output.css b/spec/libsass-closed-issues/issue_1207/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1207/expected_output.css
rename to spec/libsass-closed-issues/issue_1207/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1207/input.scss b/spec/libsass-closed-issues/issue_1207/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1207/input.scss
rename to spec/libsass-closed-issues/issue_1207/input.scss
diff --git a/spec/libsass-todo-issues/issue_1214/expected.compact.css b/spec/libsass-closed-issues/issue_1214/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1214/expected.compact.css
rename to spec/libsass-closed-issues/issue_1214/expected.compact.css
diff --git a/spec/libsass-closed-issues/issue_1214/expected.compressed.css b/spec/libsass-closed-issues/issue_1214/expected.compressed.css
new file mode 100644
index 0000000000..a09d210358
--- /dev/null
+++ b/spec/libsass-closed-issues/issue_1214/expected.compressed.css
@@ -0,0 +1 @@
+@keyframes $animation-name{0%,20%,50%,80%,100%{transform:translateY(0)}40%{transform:translateY(-30px)}60%{transform:translateY(-15px)}}
diff --git a/spec/libsass-todo-issues/issue_1214/expected.expanded.css b/spec/libsass-closed-issues/issue_1214/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1214/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1214/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1214/expected_output.css b/spec/libsass-closed-issues/issue_1214/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1214/expected_output.css
rename to spec/libsass-closed-issues/issue_1214/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1214/input.scss b/spec/libsass-closed-issues/issue_1214/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1214/input.scss
rename to spec/libsass-closed-issues/issue_1214/input.scss
diff --git a/spec/libsass-todo-issues/issue_1240/expected.compact.css b/spec/libsass-closed-issues/issue_1240/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1240/expected.compact.css
rename to spec/libsass-closed-issues/issue_1240/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1240/expected.compressed.css b/spec/libsass-closed-issues/issue_1240/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1240/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1240/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1240/expected.expanded.css b/spec/libsass-closed-issues/issue_1240/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1240/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1240/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1240/expected_output.css b/spec/libsass-closed-issues/issue_1240/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1240/expected_output.css
rename to spec/libsass-closed-issues/issue_1240/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1240/input.scss b/spec/libsass-closed-issues/issue_1240/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1240/input.scss
rename to spec/libsass-closed-issues/issue_1240/input.scss
diff --git a/spec/libsass-todo-issues/issue_1253/expected.compact.css b/spec/libsass-closed-issues/issue_1253/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1253/expected.compact.css
rename to spec/libsass-closed-issues/issue_1253/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1253/expected.compressed.css b/spec/libsass-closed-issues/issue_1253/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1253/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1253/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1253/expected.expanded.css b/spec/libsass-closed-issues/issue_1253/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1253/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1253/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1253/expected_output.css b/spec/libsass-closed-issues/issue_1253/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1253/expected_output.css
rename to spec/libsass-closed-issues/issue_1253/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1253/input.scss b/spec/libsass-closed-issues/issue_1253/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1253/input.scss
rename to spec/libsass-closed-issues/issue_1253/input.scss
diff --git a/spec/libsass-todo-issues/issue_1260/expected.compact.css b/spec/libsass-closed-issues/issue_1260/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1260/expected.compact.css
rename to spec/libsass-closed-issues/issue_1260/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1260/expected.compressed.css b/spec/libsass-closed-issues/issue_1260/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1260/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1260/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1260/expected.expanded.css b/spec/libsass-closed-issues/issue_1260/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1260/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1260/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1260/expected_output.css b/spec/libsass-closed-issues/issue_1260/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1260/expected_output.css
rename to spec/libsass-closed-issues/issue_1260/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1260/input.scss b/spec/libsass-closed-issues/issue_1260/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1260/input.scss
rename to spec/libsass-closed-issues/issue_1260/input.scss
diff --git a/spec/libsass-todo-issues/issue_1263/expected.compact.css b/spec/libsass-closed-issues/issue_1263/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1263/expected.compact.css
rename to spec/libsass-closed-issues/issue_1263/expected.compact.css
diff --git a/spec/libsass-closed-issues/issue_1263/expected.compressed.css b/spec/libsass-closed-issues/issue_1263/expected.compressed.css
new file mode 100644
index 0000000000..3aa0cde7eb
--- /dev/null
+++ b/spec/libsass-closed-issues/issue_1263/expected.compressed.css
@@ -0,0 +1 @@
+foo{@ap ply;@apply (--bar);@apply (  --bar  );@ap ply   (   --bar , --foo  )}
diff --git a/spec/libsass-todo-issues/issue_1263/expected.expanded.css b/spec/libsass-closed-issues/issue_1263/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1263/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1263/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1263/expected_output.css b/spec/libsass-closed-issues/issue_1263/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1263/expected_output.css
rename to spec/libsass-closed-issues/issue_1263/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1263/input.scss b/spec/libsass-closed-issues/issue_1263/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1263/input.scss
rename to spec/libsass-closed-issues/issue_1263/input.scss
diff --git a/spec/libsass-todo-issues/issue_1277/expected.compact.css b/spec/libsass-closed-issues/issue_1277/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1277/expected.compact.css
rename to spec/libsass-closed-issues/issue_1277/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1277/expected.compressed.css b/spec/libsass-closed-issues/issue_1277/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1277/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1277/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1277/expected.expanded.css b/spec/libsass-closed-issues/issue_1277/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1277/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1277/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1277/expected_output.css b/spec/libsass-closed-issues/issue_1277/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1277/expected_output.css
rename to spec/libsass-closed-issues/issue_1277/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1277/input.scss b/spec/libsass-closed-issues/issue_1277/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1277/input.scss
rename to spec/libsass-closed-issues/issue_1277/input.scss
diff --git a/spec/libsass-todo-issues/issue_1285/expected.compact.css b/spec/libsass-closed-issues/issue_1285/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1285/expected.compact.css
rename to spec/libsass-closed-issues/issue_1285/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1285/expected.compressed.css b/spec/libsass-closed-issues/issue_1285/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1285/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1285/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1285/expected.expanded.css b/spec/libsass-closed-issues/issue_1285/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1285/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1285/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1285/expected_output.css b/spec/libsass-closed-issues/issue_1285/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1285/expected_output.css
rename to spec/libsass-closed-issues/issue_1285/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1285/input.scss b/spec/libsass-closed-issues/issue_1285/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1285/input.scss
rename to spec/libsass-closed-issues/issue_1285/input.scss
diff --git a/spec/libsass-todo-issues/issue_1297/expected.compact.css b/spec/libsass-closed-issues/issue_1297/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1297/expected.compact.css
rename to spec/libsass-closed-issues/issue_1297/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1297/expected.compressed.css b/spec/libsass-closed-issues/issue_1297/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1297/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1297/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1297/expected.expanded.css b/spec/libsass-closed-issues/issue_1297/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1297/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1297/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1297/expected_output.css b/spec/libsass-closed-issues/issue_1297/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1297/expected_output.css
rename to spec/libsass-closed-issues/issue_1297/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1297/input.scss b/spec/libsass-closed-issues/issue_1297/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1297/input.scss
rename to spec/libsass-closed-issues/issue_1297/input.scss
diff --git a/spec/libsass-todo-issues/issue_1301/expected.compact.css b/spec/libsass-closed-issues/issue_1301/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1301/expected.compact.css
rename to spec/libsass-closed-issues/issue_1301/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1301/expected.compressed.css b/spec/libsass-closed-issues/issue_1301/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1301/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1301/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1301/expected.expanded.css b/spec/libsass-closed-issues/issue_1301/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1301/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1301/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1301/expected_output.css b/spec/libsass-closed-issues/issue_1301/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1301/expected_output.css
rename to spec/libsass-closed-issues/issue_1301/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1301/input.scss b/spec/libsass-closed-issues/issue_1301/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1301/input.scss
rename to spec/libsass-closed-issues/issue_1301/input.scss
diff --git a/spec/libsass-todo-issues/issue_1303/expected.compact.css b/spec/libsass-closed-issues/issue_1303/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1303/expected.compact.css
rename to spec/libsass-closed-issues/issue_1303/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1303/expected.compressed.css b/spec/libsass-closed-issues/issue_1303/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1303/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1303/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1303/expected.expanded.css b/spec/libsass-closed-issues/issue_1303/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1303/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1303/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1303/expected_output.css b/spec/libsass-closed-issues/issue_1303/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1303/expected_output.css
rename to spec/libsass-closed-issues/issue_1303/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1303/input.scss b/spec/libsass-closed-issues/issue_1303/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1303/input.scss
rename to spec/libsass-closed-issues/issue_1303/input.scss
diff --git a/spec/libsass-todo-issues/issue_1336/expected.compact.css b/spec/libsass-closed-issues/issue_1336/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1336/expected.compact.css
rename to spec/libsass-closed-issues/issue_1336/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_1336/expected.compressed.css b/spec/libsass-closed-issues/issue_1336/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1336/expected.compressed.css
rename to spec/libsass-closed-issues/issue_1336/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_1336/expected.expanded.css b/spec/libsass-closed-issues/issue_1336/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1336/expected.expanded.css
rename to spec/libsass-closed-issues/issue_1336/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_1336/expected_output.css b/spec/libsass-closed-issues/issue_1336/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_1336/expected_output.css
rename to spec/libsass-closed-issues/issue_1336/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_1336/input.scss b/spec/libsass-closed-issues/issue_1336/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_1336/input.scss
rename to spec/libsass-closed-issues/issue_1336/input.scss
diff --git a/spec/libsass-todo-issues/issue_941/expected.compact.css b/spec/libsass-closed-issues/issue_941/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_941/expected.compact.css
rename to spec/libsass-closed-issues/issue_941/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_941/expected.compressed.css b/spec/libsass-closed-issues/issue_941/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_941/expected.compressed.css
rename to spec/libsass-closed-issues/issue_941/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_941/expected.expanded.css b/spec/libsass-closed-issues/issue_941/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_941/expected.expanded.css
rename to spec/libsass-closed-issues/issue_941/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_941/expected_output.css b/spec/libsass-closed-issues/issue_941/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_941/expected_output.css
rename to spec/libsass-closed-issues/issue_941/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_941/input.scss b/spec/libsass-closed-issues/issue_941/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_941/input.scss
rename to spec/libsass-closed-issues/issue_941/input.scss
diff --git a/spec/libsass-todo-issues/issue_948/expected.compact.css b/spec/libsass-closed-issues/issue_948/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_948/expected.compact.css
rename to spec/libsass-closed-issues/issue_948/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_948/expected.compressed.css b/spec/libsass-closed-issues/issue_948/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_948/expected.compressed.css
rename to spec/libsass-closed-issues/issue_948/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_948/expected.expanded.css b/spec/libsass-closed-issues/issue_948/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_948/expected.expanded.css
rename to spec/libsass-closed-issues/issue_948/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_948/expected_output.css b/spec/libsass-closed-issues/issue_948/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_948/expected_output.css
rename to spec/libsass-closed-issues/issue_948/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_948/input.scss b/spec/libsass-closed-issues/issue_948/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_948/input.scss
rename to spec/libsass-closed-issues/issue_948/input.scss
diff --git a/spec/libsass-todo-issues/issue_1214/expected.compressed.css b/spec/libsass-todo-issues/issue_1214/expected.compressed.css
deleted file mode 100644
index fab91a858b..0000000000
--- a/spec/libsass-todo-issues/issue_1214/expected.compressed.css
+++ /dev/null
@@ -1 +0,0 @@
-@keyframes $animation-name{0%, 20%, 50%, 80%, 100%{transform:translateY(0)}40%{transform:translateY(-30px)}60%{transform:translateY(-15px)}}
diff --git a/spec/libsass-todo-issues/issue_1263/expected.compressed.css b/spec/libsass-todo-issues/issue_1263/expected.compressed.css
deleted file mode 100644
index 8ba4ed6f43..0000000000
--- a/spec/libsass-todo-issues/issue_1263/expected.compressed.css
+++ /dev/null
@@ -1 +0,0 @@
-foo{@ap ply;;@apply (--bar);;@apply (  --bar  );;@ap ply   (   --bar , --foo  );}
diff --git a/spec/libsass-todo-tests/38_expressions_in_at_directives/expected.compressed.css b/spec/libsass-todo-tests/38_expressions_in_at_directives/expected.compressed.css
deleted file mode 100644
index 65cbe4c3e3..0000000000
--- a/spec/libsass-todo-tests/38_expressions_in_at_directives/expected.compressed.css
+++ /dev/null
@@ -1 +0,0 @@
-@foo $x $y, hux{bar{whatever:whatever}}
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/basic/expected.compact.css b/spec/libsass/parent-selector/basic/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/basic/expected.compact.css
rename to spec/libsass/parent-selector/basic/expected.compact.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/basic/expected.compressed.css b/spec/libsass/parent-selector/basic/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/basic/expected.compressed.css
rename to spec/libsass/parent-selector/basic/expected.compressed.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/basic/expected.expanded.css b/spec/libsass/parent-selector/basic/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/basic/expected.expanded.css
rename to spec/libsass/parent-selector/basic/expected.expanded.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/basic/expected_output.css b/spec/libsass/parent-selector/basic/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/basic/expected_output.css
rename to spec/libsass/parent-selector/basic/expected_output.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/basic/input.scss b/spec/libsass/parent-selector/basic/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/basic/input.scss
rename to spec/libsass/parent-selector/basic/input.scss
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected.compact.css b/spec/libsass/parent-selector/inner-combinator/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected.compact.css
rename to spec/libsass/parent-selector/inner-combinator/expected.compact.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected.compressed.css b/spec/libsass/parent-selector/inner-combinator/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected.compressed.css
rename to spec/libsass/parent-selector/inner-combinator/expected.compressed.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected.expanded.css b/spec/libsass/parent-selector/inner-combinator/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected.expanded.css
rename to spec/libsass/parent-selector/inner-combinator/expected.expanded.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected_output.css b/spec/libsass/parent-selector/inner-combinator/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/expected_output.css
rename to spec/libsass/parent-selector/inner-combinator/expected_output.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/input.scss b/spec/libsass/parent-selector/inner-combinator/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-combinator/input.scss
rename to spec/libsass/parent-selector/inner-combinator/input.scss
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected.compact.css b/spec/libsass/parent-selector/inner-pseudo/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected.compact.css
rename to spec/libsass/parent-selector/inner-pseudo/expected.compact.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected.compressed.css b/spec/libsass/parent-selector/inner-pseudo/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected.compressed.css
rename to spec/libsass/parent-selector/inner-pseudo/expected.compressed.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected.expanded.css b/spec/libsass/parent-selector/inner-pseudo/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected.expanded.css
rename to spec/libsass/parent-selector/inner-pseudo/expected.expanded.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected_output.css b/spec/libsass/parent-selector/inner-pseudo/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/expected_output.css
rename to spec/libsass/parent-selector/inner-pseudo/expected_output.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/input.scss b/spec/libsass/parent-selector/inner-pseudo/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/inner-pseudo/input.scss
rename to spec/libsass/parent-selector/inner-pseudo/input.scss
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected.compact.css b/spec/libsass/parent-selector/outer-combinator/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected.compact.css
rename to spec/libsass/parent-selector/outer-combinator/expected.compact.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected.compressed.css b/spec/libsass/parent-selector/outer-combinator/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected.compressed.css
rename to spec/libsass/parent-selector/outer-combinator/expected.compressed.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected.expanded.css b/spec/libsass/parent-selector/outer-combinator/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected.expanded.css
rename to spec/libsass/parent-selector/outer-combinator/expected.expanded.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected_output.css b/spec/libsass/parent-selector/outer-combinator/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/expected_output.css
rename to spec/libsass/parent-selector/outer-combinator/expected_output.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/input.scss b/spec/libsass/parent-selector/outer-combinator/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-combinator/input.scss
rename to spec/libsass/parent-selector/outer-combinator/input.scss
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected.compact.css b/spec/libsass/parent-selector/outer-pseudo/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected.compact.css
rename to spec/libsass/parent-selector/outer-pseudo/expected.compact.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected.compressed.css b/spec/libsass/parent-selector/outer-pseudo/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected.compressed.css
rename to spec/libsass/parent-selector/outer-pseudo/expected.compressed.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected.expanded.css b/spec/libsass/parent-selector/outer-pseudo/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected.expanded.css
rename to spec/libsass/parent-selector/outer-pseudo/expected.expanded.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected_output.css b/spec/libsass/parent-selector/outer-pseudo/expected_output.css
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/expected_output.css
rename to spec/libsass/parent-selector/outer-pseudo/expected_output.css
diff --git a/spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/input.scss b/spec/libsass/parent-selector/outer-pseudo/input.scss
similarity index 100%
rename from spec/libsass-todo-tests/libsass/parent-selector/outer-pseudo/input.scss
rename to spec/libsass/parent-selector/outer-pseudo/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/append/expected.compact.css b/spec/selector-functions/append/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/append/expected.compact.css
rename to spec/selector-functions/append/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/append/expected.compressed.css b/spec/selector-functions/append/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/append/expected.compressed.css
rename to spec/selector-functions/append/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/append/expected.expanded.css b/spec/selector-functions/append/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/append/expected.expanded.css
rename to spec/selector-functions/append/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/append/expected_output.css b/spec/selector-functions/append/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/append/expected_output.css
rename to spec/selector-functions/append/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/append/input.scss b/spec/selector-functions/append/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/append/input.scss
rename to spec/selector-functions/append/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/expected.compact.css b/spec/selector-functions/extend/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/expected.compact.css
rename to spec/selector-functions/extend/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/expected.compressed.css b/spec/selector-functions/extend/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/expected.compressed.css
rename to spec/selector-functions/extend/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/expected.expanded.css b/spec/selector-functions/extend/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/expected.expanded.css
rename to spec/selector-functions/extend/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/expected_output.css b/spec/selector-functions/extend/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/expected_output.css
rename to spec/selector-functions/extend/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/input.scss b/spec/selector-functions/extend/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/input.scss
rename to spec/selector-functions/extend/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected.compact.css b/spec/selector-functions/extend/nested/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected.compact.css
rename to spec/selector-functions/extend/nested/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected.compressed.css b/spec/selector-functions/extend/nested/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected.compressed.css
rename to spec/selector-functions/extend/nested/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected.expanded.css b/spec/selector-functions/extend/nested/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected.expanded.css
rename to spec/selector-functions/extend/nested/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected_output.css b/spec/selector-functions/extend/nested/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/expected_output.css
rename to spec/selector-functions/extend/nested/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/input.scss b/spec/selector-functions/extend/nested/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/extend/nested/input.scss
rename to spec/selector-functions/extend/nested/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compact.css b/spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compact.css
rename to spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compressed.css b/spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compressed.css
rename to spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.expanded.css b/spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.expanded.css
rename to spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected_output.css b/spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected_output.css
rename to spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/input.scss b/spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/has_is_superselector_of_subset_host/input.scss
rename to spec/selector-functions/is_superselector/has_is_superselector_of_subset_host/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compact.css b/spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compact.css
rename to spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compressed.css b/spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compressed.css
rename to spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.expanded.css b/spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.expanded.css
rename to spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected_output.css b/spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected_output.css
rename to spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/input.scss b/spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/input.scss
rename to spec/selector-functions/is_superselector/host_context_is_superselector_of_subset_host/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compact.css b/spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compact.css
rename to spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compressed.css b/spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compressed.css
rename to spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.expanded.css b/spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.expanded.css
rename to spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected_output.css b/spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected_output.css
rename to spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/input.scss b/spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/host_is_superselector_of_subset_host/input.scss
rename to spec/selector-functions/is_superselector/host_is_superselector_of_subset_host/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compact.css b/spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compact.css
rename to spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compressed.css b/spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compressed.css
rename to spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.expanded.css b/spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.expanded.css
rename to spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected_output.css b/spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected_output.css
rename to spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/input.scss b/spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/input.scss
rename to spec/selector-functions/is_superselector/matches_is_superselector_of_subset_matches/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compact.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compact.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compressed.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compressed.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.expanded.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.expanded.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected_output.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected_output.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/input.scss b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/input.scss
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_last_match/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compact.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compact.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compressed.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compressed.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.expanded.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.expanded.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected_output.css b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected_output.css
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/input.scss b/spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/input.scss
rename to spec/selector-functions/is_superselector/nth_match_is_not_superselector_of_nth_match_with_different_arg/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/nest/expected.compact.css b/spec/selector-functions/nest/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/nest/expected.compact.css
rename to spec/selector-functions/nest/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/nest/expected.compressed.css b/spec/selector-functions/nest/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/nest/expected.compressed.css
rename to spec/selector-functions/nest/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/nest/expected.expanded.css b/spec/selector-functions/nest/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/nest/expected.expanded.css
rename to spec/selector-functions/nest/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/nest/expected_output.css b/spec/selector-functions/nest/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/nest/expected_output.css
rename to spec/selector-functions/nest/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/nest/input.scss b/spec/selector-functions/nest/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/nest/input.scss
rename to spec/selector-functions/nest/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/parse/expected.compact.css b/spec/selector-functions/parse/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/parse/expected.compact.css
rename to spec/selector-functions/parse/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/parse/expected.compressed.css b/spec/selector-functions/parse/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/parse/expected.compressed.css
rename to spec/selector-functions/parse/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/parse/expected.expanded.css b/spec/selector-functions/parse/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/parse/expected.expanded.css
rename to spec/selector-functions/parse/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/parse/expected_output.css b/spec/selector-functions/parse/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/parse/expected_output.css
rename to spec/selector-functions/parse/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/parse/input.scss b/spec/selector-functions/parse/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/parse/input.scss
rename to spec/selector-functions/parse/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/replace/expected.compact.css b/spec/selector-functions/replace/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/replace/expected.compact.css
rename to spec/selector-functions/replace/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/replace/expected.compressed.css b/spec/selector-functions/replace/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/replace/expected.compressed.css
rename to spec/selector-functions/replace/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/replace/expected.expanded.css b/spec/selector-functions/replace/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/replace/expected.expanded.css
rename to spec/selector-functions/replace/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/replace/expected_output.css b/spec/selector-functions/replace/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/replace/expected_output.css
rename to spec/selector-functions/replace/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/replace/input.scss b/spec/selector-functions/replace/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/replace/input.scss
rename to spec/selector-functions/replace/input.scss
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/unify/expected.compact.css b/spec/selector-functions/unify/expected.compact.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/unify/expected.compact.css
rename to spec/selector-functions/unify/expected.compact.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/unify/expected.compressed.css b/spec/selector-functions/unify/expected.compressed.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/unify/expected.compressed.css
rename to spec/selector-functions/unify/expected.compressed.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/unify/expected.expanded.css b/spec/selector-functions/unify/expected.expanded.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/unify/expected.expanded.css
rename to spec/selector-functions/unify/expected.expanded.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/unify/expected_output.css b/spec/selector-functions/unify/expected_output.css
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/unify/expected_output.css
rename to spec/selector-functions/unify/expected_output.css
diff --git a/spec/libsass-todo-issues/issue_963/selector-functions/unify/input.scss b/spec/selector-functions/unify/input.scss
similarity index 100%
rename from spec/libsass-todo-issues/issue_963/selector-functions/unify/input.scss
rename to spec/selector-functions/unify/input.scss