diff --git a/tests/graphql_arguments/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/arguments/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_arguments/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/arguments/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_arguments/hello.graphql b/tests/graphql/arguments/hello.graphql
similarity index 100%
rename from tests/graphql_arguments/hello.graphql
rename to tests/graphql/arguments/hello.graphql
diff --git a/tests/graphql_arguments/jsfmt.spec.js b/tests/graphql/arguments/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_arguments/jsfmt.spec.js
rename to tests/graphql/arguments/jsfmt.spec.js
diff --git a/tests/graphql_bracket_spacing/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/bracket-spacing/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_bracket_spacing/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/bracket-spacing/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_bracket_spacing/bracket_spacing.graphql b/tests/graphql/bracket-spacing/bracket_spacing.graphql
similarity index 100%
rename from tests/graphql_bracket_spacing/bracket_spacing.graphql
rename to tests/graphql/bracket-spacing/bracket_spacing.graphql
diff --git a/tests/graphql_bracket_spacing/jsfmt.spec.js b/tests/graphql/bracket-spacing/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_bracket_spacing/jsfmt.spec.js
rename to tests/graphql/bracket-spacing/jsfmt.spec.js
diff --git a/tests/graphql_comments/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/comments/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_comments/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/comments/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_comments/argument_comment.graphql b/tests/graphql/comments/argument_comment.graphql
similarity index 100%
rename from tests/graphql_comments/argument_comment.graphql
rename to tests/graphql/comments/argument_comment.graphql
diff --git a/tests/graphql_comments/fields.graphql b/tests/graphql/comments/fields.graphql
similarity index 100%
rename from tests/graphql_comments/fields.graphql
rename to tests/graphql/comments/fields.graphql
diff --git a/tests/graphql_comments/interfaces.graphql b/tests/graphql/comments/interfaces.graphql
similarity index 100%
rename from tests/graphql_comments/interfaces.graphql
rename to tests/graphql/comments/interfaces.graphql
diff --git a/tests/graphql_comments/jsfmt.spec.js b/tests/graphql/comments/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_comments/jsfmt.spec.js
rename to tests/graphql/comments/jsfmt.spec.js
diff --git a/tests/graphql_comments/tokens.graphql b/tests/graphql/comments/tokens.graphql
similarity index 100%
rename from tests/graphql_comments/tokens.graphql
rename to tests/graphql/comments/tokens.graphql
diff --git a/tests/graphql_definitions/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/definitions/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_definitions/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/definitions/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_definitions/fields.graphql b/tests/graphql/definitions/fields.graphql
similarity index 100%
rename from tests/graphql_definitions/fields.graphql
rename to tests/graphql/definitions/fields.graphql
diff --git a/tests/graphql_definitions/jsfmt.spec.js b/tests/graphql/definitions/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_definitions/jsfmt.spec.js
rename to tests/graphql/definitions/jsfmt.spec.js
diff --git a/tests/graphql_directive_decl/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/directive-decl/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_directive_decl/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/directive-decl/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_directive_decl/directive_decl.graphql b/tests/graphql/directive-decl/directive_decl.graphql
similarity index 100%
rename from tests/graphql_directive_decl/directive_decl.graphql
rename to tests/graphql/directive-decl/directive_decl.graphql
diff --git a/tests/graphql_directive_decl/jsfmt.spec.js b/tests/graphql/directive-decl/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_directive_decl/jsfmt.spec.js
rename to tests/graphql/directive-decl/jsfmt.spec.js
diff --git a/tests/graphql_directives/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/directives/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_directives/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/directives/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_directives/directives.graphql b/tests/graphql/directives/directives.graphql
similarity index 100%
rename from tests/graphql_directives/directives.graphql
rename to tests/graphql/directives/directives.graphql
diff --git a/tests/graphql_directives/jsfmt.spec.js b/tests/graphql/directives/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_directives/jsfmt.spec.js
rename to tests/graphql/directives/jsfmt.spec.js
diff --git a/tests/graphql_enum/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/enum/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_enum/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/enum/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_enum/enum.graphql b/tests/graphql/enum/enum.graphql
similarity index 100%
rename from tests/graphql_enum/enum.graphql
rename to tests/graphql/enum/enum.graphql
diff --git a/tests/graphql_enum/jsfmt.spec.js b/tests/graphql/enum/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_enum/jsfmt.spec.js
rename to tests/graphql/enum/jsfmt.spec.js
diff --git a/tests/graphql_fields/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/fields/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_fields/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/fields/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_fields/fields.graphql b/tests/graphql/fields/fields.graphql
similarity index 100%
rename from tests/graphql_fields/fields.graphql
rename to tests/graphql/fields/fields.graphql
diff --git a/tests/graphql_fields/jsfmt.spec.js b/tests/graphql/fields/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_fields/jsfmt.spec.js
rename to tests/graphql/fields/jsfmt.spec.js
diff --git a/tests/graphql_fragment_variables/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/fragment-variables/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_fragment_variables/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/fragment-variables/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_fragment_variables/fragment_variables.graphql b/tests/graphql/fragment-variables/fragment_variables.graphql
similarity index 100%
rename from tests/graphql_fragment_variables/fragment_variables.graphql
rename to tests/graphql/fragment-variables/fragment_variables.graphql
diff --git a/tests/graphql_fragment_variables/jsfmt.spec.js b/tests/graphql/fragment-variables/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_fragment_variables/jsfmt.spec.js
rename to tests/graphql/fragment-variables/jsfmt.spec.js
diff --git a/tests/graphql_fragments/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/fragments/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_fragments/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/fragments/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_fragments/fragments.graphql b/tests/graphql/fragments/fragments.graphql
similarity index 100%
rename from tests/graphql_fragments/fragments.graphql
rename to tests/graphql/fragments/fragments.graphql
diff --git a/tests/graphql_fragments/jsfmt.spec.js b/tests/graphql/fragments/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_fragments/jsfmt.spec.js
rename to tests/graphql/fragments/jsfmt.spec.js
diff --git a/tests/graphql_hello/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/hello/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_hello/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/hello/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_hello/hello.graphql b/tests/graphql/hello/hello.graphql
similarity index 100%
rename from tests/graphql_hello/hello.graphql
rename to tests/graphql/hello/hello.graphql
diff --git a/tests/graphql_hello/jsfmt.spec.js b/tests/graphql/hello/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_hello/jsfmt.spec.js
rename to tests/graphql/hello/jsfmt.spec.js
diff --git a/tests/graphql_interface/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/interface/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_interface/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/interface/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_interface/interface.graphql b/tests/graphql/interface/interface.graphql
similarity index 100%
rename from tests/graphql_interface/interface.graphql
rename to tests/graphql/interface/interface.graphql
diff --git a/tests/graphql_interface/jsfmt.spec.js b/tests/graphql/interface/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_interface/jsfmt.spec.js
rename to tests/graphql/interface/jsfmt.spec.js
diff --git a/tests/graphql_interface/object_type_def.graphql b/tests/graphql/interface/object_type_def.graphql
similarity index 100%
rename from tests/graphql_interface/object_type_def.graphql
rename to tests/graphql/interface/object_type_def.graphql
diff --git a/tests/graphql_interface/object_type_def_mixed_syntax.graphql b/tests/graphql/interface/object_type_def_mixed_syntax.graphql
similarity index 100%
rename from tests/graphql_interface/object_type_def_mixed_syntax.graphql
rename to tests/graphql/interface/object_type_def_mixed_syntax.graphql
diff --git a/tests/graphql_interface/object_type_def_old_syntax.graphql b/tests/graphql/interface/object_type_def_old_syntax.graphql
similarity index 100%
rename from tests/graphql_interface/object_type_def_old_syntax.graphql
rename to tests/graphql/interface/object_type_def_old_syntax.graphql
diff --git a/tests/graphql_interface/separator-detection.graphql b/tests/graphql/interface/separator-detection.graphql
similarity index 100%
rename from tests/graphql_interface/separator-detection.graphql
rename to tests/graphql/interface/separator-detection.graphql
diff --git a/tests/graphql_kitchen_sink/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/kitchen-sink/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_kitchen_sink/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/kitchen-sink/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_kitchen_sink/jsfmt.spec.js b/tests/graphql/kitchen-sink/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_kitchen_sink/jsfmt.spec.js
rename to tests/graphql/kitchen-sink/jsfmt.spec.js
diff --git a/tests/graphql_kitchen_sink/kitchen_sink.graphql b/tests/graphql/kitchen-sink/kitchen_sink.graphql
similarity index 100%
rename from tests/graphql_kitchen_sink/kitchen_sink.graphql
rename to tests/graphql/kitchen-sink/kitchen_sink.graphql
diff --git a/tests/graphql_kitchen_sink/schema_kitchen_sink.graphql b/tests/graphql/kitchen-sink/schema_kitchen_sink.graphql
similarity index 100%
rename from tests/graphql_kitchen_sink/schema_kitchen_sink.graphql
rename to tests/graphql/kitchen-sink/schema_kitchen_sink.graphql
diff --git a/tests/graphql_lists/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/lists/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_lists/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/lists/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_lists/jsfmt.spec.js b/tests/graphql/lists/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_lists/jsfmt.spec.js
rename to tests/graphql/lists/jsfmt.spec.js
diff --git a/tests/graphql_lists/lists.graphql b/tests/graphql/lists/lists.graphql
similarity index 100%
rename from tests/graphql_lists/lists.graphql
rename to tests/graphql/lists/lists.graphql
diff --git a/tests/graphql_newline/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/newline/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_newline/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/newline/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_newline/__snapshots__/obj_type_def.graphql b/tests/graphql/newline/__snapshots__/obj_type_def.graphql
similarity index 100%
rename from tests/graphql_newline/__snapshots__/obj_type_def.graphql
rename to tests/graphql/newline/__snapshots__/obj_type_def.graphql
diff --git a/tests/graphql_newline/directive_decl.graphql b/tests/graphql/newline/directive_decl.graphql
similarity index 100%
rename from tests/graphql_newline/directive_decl.graphql
rename to tests/graphql/newline/directive_decl.graphql
diff --git a/tests/graphql_newline/directives.graphql b/tests/graphql/newline/directives.graphql
similarity index 100%
rename from tests/graphql_newline/directives.graphql
rename to tests/graphql/newline/directives.graphql
diff --git a/tests/graphql_newline/enum.graphql b/tests/graphql/newline/enum.graphql
similarity index 100%
rename from tests/graphql_newline/enum.graphql
rename to tests/graphql/newline/enum.graphql
diff --git a/tests/graphql_newline/fields.graphql b/tests/graphql/newline/fields.graphql
similarity index 100%
rename from tests/graphql_newline/fields.graphql
rename to tests/graphql/newline/fields.graphql
diff --git a/tests/graphql_newline/input.graphql b/tests/graphql/newline/input.graphql
similarity index 100%
rename from tests/graphql_newline/input.graphql
rename to tests/graphql/newline/input.graphql
diff --git a/tests/graphql_newline/interface.graphql b/tests/graphql/newline/interface.graphql
similarity index 100%
rename from tests/graphql_newline/interface.graphql
rename to tests/graphql/newline/interface.graphql
diff --git a/tests/graphql_newline/jsfmt.spec.js b/tests/graphql/newline/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_newline/jsfmt.spec.js
rename to tests/graphql/newline/jsfmt.spec.js
diff --git a/tests/graphql_newline/object_type_def.graphql b/tests/graphql/newline/object_type_def.graphql
similarity index 100%
rename from tests/graphql_newline/object_type_def.graphql
rename to tests/graphql/newline/object_type_def.graphql
diff --git a/tests/graphql_newline/schema.graphql b/tests/graphql/newline/schema.graphql
similarity index 100%
rename from tests/graphql_newline/schema.graphql
rename to tests/graphql/newline/schema.graphql
diff --git a/tests/graphql_object_type_def/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/object-type-def/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_object_type_def/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/object-type-def/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_object_type_def/arguments.graphql b/tests/graphql/object-type-def/arguments.graphql
similarity index 100%
rename from tests/graphql_object_type_def/arguments.graphql
rename to tests/graphql/object-type-def/arguments.graphql
diff --git a/tests/graphql_object_type_def/directives.graphql b/tests/graphql/object-type-def/directives.graphql
similarity index 100%
rename from tests/graphql_object_type_def/directives.graphql
rename to tests/graphql/object-type-def/directives.graphql
diff --git a/tests/graphql_object_type_def/extend.graphql b/tests/graphql/object-type-def/extend.graphql
similarity index 100%
rename from tests/graphql_object_type_def/extend.graphql
rename to tests/graphql/object-type-def/extend.graphql
diff --git a/tests/graphql_object_type_def/implements.graphql b/tests/graphql/object-type-def/implements.graphql
similarity index 100%
rename from tests/graphql_object_type_def/implements.graphql
rename to tests/graphql/object-type-def/implements.graphql
diff --git a/tests/graphql_object_type_def/input.graphql b/tests/graphql/object-type-def/input.graphql
similarity index 100%
rename from tests/graphql_object_type_def/input.graphql
rename to tests/graphql/object-type-def/input.graphql
diff --git a/tests/graphql_object_type_def/jsfmt.spec.js b/tests/graphql/object-type-def/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_object_type_def/jsfmt.spec.js
rename to tests/graphql/object-type-def/jsfmt.spec.js
diff --git a/tests/graphql_object_type_def/object_type_def.graphql b/tests/graphql/object-type-def/object_type_def.graphql
similarity index 100%
rename from tests/graphql_object_type_def/object_type_def.graphql
rename to tests/graphql/object-type-def/object_type_def.graphql
diff --git a/tests/graphql_objects/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/objects/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_objects/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/objects/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_objects/jsfmt.spec.js b/tests/graphql/objects/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_objects/jsfmt.spec.js
rename to tests/graphql/objects/jsfmt.spec.js
diff --git a/tests/graphql_objects/objects.graphql b/tests/graphql/objects/objects.graphql
similarity index 100%
rename from tests/graphql_objects/objects.graphql
rename to tests/graphql/objects/objects.graphql
diff --git a/tests/graphql_scalar/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/scalar/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_scalar/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/scalar/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_scalar/jsfmt.spec.js b/tests/graphql/scalar/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_scalar/jsfmt.spec.js
rename to tests/graphql/scalar/jsfmt.spec.js
diff --git a/tests/graphql_scalar/scalar.graphql b/tests/graphql/scalar/scalar.graphql
similarity index 100%
rename from tests/graphql_scalar/scalar.graphql
rename to tests/graphql/scalar/scalar.graphql
diff --git a/tests/graphql_schema/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/schema/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_schema/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/schema/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_schema/jsfmt.spec.js b/tests/graphql/schema/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_schema/jsfmt.spec.js
rename to tests/graphql/schema/jsfmt.spec.js
diff --git a/tests/graphql_schema/schema.graphql b/tests/graphql/schema/schema.graphql
similarity index 100%
rename from tests/graphql_schema/schema.graphql
rename to tests/graphql/schema/schema.graphql
diff --git a/tests/graphql_string/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/string/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_string/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/string/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_string/jsfmt.spec.js b/tests/graphql/string/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_string/jsfmt.spec.js
rename to tests/graphql/string/jsfmt.spec.js
diff --git a/tests/graphql_string/string.graphql b/tests/graphql/string/string.graphql
similarity index 100%
rename from tests/graphql_string/string.graphql
rename to tests/graphql/string/string.graphql
diff --git a/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/trailing-comma/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/trailing-comma/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_trailing_comma/jsfmt.spec.js b/tests/graphql/trailing-comma/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_trailing_comma/jsfmt.spec.js
rename to tests/graphql/trailing-comma/jsfmt.spec.js
diff --git a/tests/graphql_trailing_comma/trailing.graphql b/tests/graphql/trailing-comma/trailing.graphql
similarity index 100%
rename from tests/graphql_trailing_comma/trailing.graphql
rename to tests/graphql/trailing-comma/trailing.graphql
diff --git a/tests/graphql_union_types/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/union-types/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_union_types/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/union-types/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_union_types/jsfmt.spec.js b/tests/graphql/union-types/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_union_types/jsfmt.spec.js
rename to tests/graphql/union-types/jsfmt.spec.js
diff --git a/tests/graphql_union_types/union_types.graphql b/tests/graphql/union-types/union_types.graphql
similarity index 100%
rename from tests/graphql_union_types/union_types.graphql
rename to tests/graphql/union-types/union_types.graphql
diff --git a/tests/graphql_variable_definitions/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/variable-definitions/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/graphql_variable_definitions/__snapshots__/jsfmt.spec.js.snap
rename to tests/graphql/variable-definitions/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/graphql_variable_definitions/jsfmt.spec.js b/tests/graphql/variable-definitions/jsfmt.spec.js
similarity index 100%
rename from tests/graphql_variable_definitions/jsfmt.spec.js
rename to tests/graphql/variable-definitions/jsfmt.spec.js
diff --git a/tests/graphql_variable_definitions/variable_definitions.graphql b/tests/graphql/variable-definitions/variable_definitions.graphql
similarity index 100%
rename from tests/graphql_variable_definitions/variable_definitions.graphql
rename to tests/graphql/variable-definitions/variable_definitions.graphql
diff --git a/tests/handlebars-attr-node/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/attr-node/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-attr-node/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/attr-node/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-attr-node/brackets.hbs b/tests/handlebars/attr-node/brackets.hbs
similarity index 100%
rename from tests/handlebars-attr-node/brackets.hbs
rename to tests/handlebars/attr-node/brackets.hbs
diff --git a/tests/handlebars-attr-node/jsfmt.spec.js b/tests/handlebars/attr-node/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-attr-node/jsfmt.spec.js
rename to tests/handlebars/attr-node/jsfmt.spec.js
diff --git a/tests/handlebars-basics/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/basics/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-basics/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/basics/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-basics/component.hbs b/tests/handlebars/basics/component.hbs
similarity index 100%
rename from tests/handlebars-basics/component.hbs
rename to tests/handlebars/basics/component.hbs
diff --git a/tests/handlebars-basics/jsfmt.spec.js b/tests/handlebars/basics/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-basics/jsfmt.spec.js
rename to tests/handlebars/basics/jsfmt.spec.js
diff --git a/tests/handlebars-basics/literals.hbs b/tests/handlebars/basics/literals.hbs
similarity index 100%
rename from tests/handlebars-basics/literals.hbs
rename to tests/handlebars/basics/literals.hbs
diff --git a/tests/handlebars-basics/nested-path.hbs b/tests/handlebars/basics/nested-path.hbs
similarity index 100%
rename from tests/handlebars-basics/nested-path.hbs
rename to tests/handlebars/basics/nested-path.hbs
diff --git a/tests/handlebars-basics/raw.hbs b/tests/handlebars/basics/raw.hbs
similarity index 100%
rename from tests/handlebars-basics/raw.hbs
rename to tests/handlebars/basics/raw.hbs
diff --git a/tests/handlebars-basics/string-literals.hbs b/tests/handlebars/basics/string-literals.hbs
similarity index 100%
rename from tests/handlebars-basics/string-literals.hbs
rename to tests/handlebars/basics/string-literals.hbs
diff --git a/tests/handlebars-block-statement/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/block-statement/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-block-statement/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/block-statement/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-block-statement/block-statement.hbs b/tests/handlebars/block-statement/block-statement.hbs
similarity index 100%
rename from tests/handlebars-block-statement/block-statement.hbs
rename to tests/handlebars/block-statement/block-statement.hbs
diff --git a/tests/handlebars-block-statement/each.hbs b/tests/handlebars/block-statement/each.hbs
similarity index 100%
rename from tests/handlebars-block-statement/each.hbs
rename to tests/handlebars/block-statement/each.hbs
diff --git a/tests/handlebars-block-statement/if-else.hbs b/tests/handlebars/block-statement/if-else.hbs
similarity index 100%
rename from tests/handlebars-block-statement/if-else.hbs
rename to tests/handlebars/block-statement/if-else.hbs
diff --git a/tests/handlebars-block-statement/jsfmt.spec.js b/tests/handlebars/block-statement/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-block-statement/jsfmt.spec.js
rename to tests/handlebars/block-statement/jsfmt.spec.js
diff --git a/tests/handlebars-block-statement/loop.hbs b/tests/handlebars/block-statement/loop.hbs
similarity index 100%
rename from tests/handlebars-block-statement/loop.hbs
rename to tests/handlebars/block-statement/loop.hbs
diff --git a/tests/handlebars-comment/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/comment/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-comment/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/comment/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-comment/comments.hbs b/tests/handlebars/comment/comments.hbs
similarity index 100%
rename from tests/handlebars-comment/comments.hbs
rename to tests/handlebars/comment/comments.hbs
diff --git a/tests/handlebars-comment/jsfmt.spec.js b/tests/handlebars/comment/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-comment/jsfmt.spec.js
rename to tests/handlebars/comment/jsfmt.spec.js
diff --git a/tests/handlebars-concat-statement/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/concat-statement/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-concat-statement/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/concat-statement/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-concat-statement/concat-statement.hbs b/tests/handlebars/concat-statement/concat-statement.hbs
similarity index 100%
rename from tests/handlebars-concat-statement/concat-statement.hbs
rename to tests/handlebars/concat-statement/concat-statement.hbs
diff --git a/tests/handlebars-concat-statement/in-attr-node.hbs b/tests/handlebars/concat-statement/in-attr-node.hbs
similarity index 100%
rename from tests/handlebars-concat-statement/in-attr-node.hbs
rename to tests/handlebars/concat-statement/in-attr-node.hbs
diff --git a/tests/handlebars-concat-statement/jsfmt.spec.js b/tests/handlebars/concat-statement/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-concat-statement/jsfmt.spec.js
rename to tests/handlebars/concat-statement/jsfmt.spec.js
diff --git a/tests/handlebars-element-node/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/element-node/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-element-node/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/element-node/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-element-node/element-node.hbs b/tests/handlebars/element-node/element-node.hbs
similarity index 100%
rename from tests/handlebars-element-node/element-node.hbs
rename to tests/handlebars/element-node/element-node.hbs
diff --git a/tests/handlebars-element-node/jsfmt.spec.js b/tests/handlebars/element-node/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-element-node/jsfmt.spec.js
rename to tests/handlebars/element-node/jsfmt.spec.js
diff --git a/tests/handlebars-escape/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/escape/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-escape/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/escape/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-escape/html-entities.hbs b/tests/handlebars/escape/html-entities.hbs
similarity index 100%
rename from tests/handlebars-escape/html-entities.hbs
rename to tests/handlebars/escape/html-entities.hbs
diff --git a/tests/handlebars-escape/jsfmt.spec.js b/tests/handlebars/escape/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-escape/jsfmt.spec.js
rename to tests/handlebars/escape/jsfmt.spec.js
diff --git a/tests/handlebars-last-line/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/last-line/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-last-line/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/last-line/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-last-line/empty-with-no-trailing-newline.hbs b/tests/handlebars/last-line/empty-with-no-trailing-newline.hbs
similarity index 100%
rename from tests/handlebars-last-line/empty-with-no-trailing-newline.hbs
rename to tests/handlebars/last-line/empty-with-no-trailing-newline.hbs
diff --git a/tests/handlebars-last-line/empty-with-trailing-newline.hbs b/tests/handlebars/last-line/empty-with-trailing-newline.hbs
similarity index 100%
rename from tests/handlebars-last-line/empty-with-trailing-newline.hbs
rename to tests/handlebars/last-line/empty-with-trailing-newline.hbs
diff --git a/tests/handlebars-last-line/end-of-line-last.hbs b/tests/handlebars/last-line/end-of-line-last.hbs
similarity index 100%
rename from tests/handlebars-last-line/end-of-line-last.hbs
rename to tests/handlebars/last-line/end-of-line-last.hbs
diff --git a/tests/handlebars-last-line/jsfmt.spec.js b/tests/handlebars/last-line/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-last-line/jsfmt.spec.js
rename to tests/handlebars/last-line/jsfmt.spec.js
diff --git a/tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/mustache-statement/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-mustache-statement/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/mustache-statement/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-mustache-statement/basics.hbs b/tests/handlebars/mustache-statement/basics.hbs
similarity index 100%
rename from tests/handlebars-mustache-statement/basics.hbs
rename to tests/handlebars/mustache-statement/basics.hbs
diff --git a/tests/handlebars-mustache-statement/element-modifier-statement.hbs b/tests/handlebars/mustache-statement/element-modifier-statement.hbs
similarity index 100%
rename from tests/handlebars-mustache-statement/element-modifier-statement.hbs
rename to tests/handlebars/mustache-statement/element-modifier-statement.hbs
diff --git a/tests/handlebars-mustache-statement/jsfmt.spec.js b/tests/handlebars/mustache-statement/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-mustache-statement/jsfmt.spec.js
rename to tests/handlebars/mustache-statement/jsfmt.spec.js
diff --git a/tests/handlebars-newline/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/newline/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-newline/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/newline/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-newline/jsfmt.spec.js b/tests/handlebars/newline/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-newline/jsfmt.spec.js
rename to tests/handlebars/newline/jsfmt.spec.js
diff --git a/tests/handlebars-newline/test.hbs b/tests/handlebars/newline/test.hbs
similarity index 100%
rename from tests/handlebars-newline/test.hbs
rename to tests/handlebars/newline/test.hbs
diff --git a/tests/handlebars-prettier-ignore/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-prettier-ignore/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-prettier-ignore/jsfmt.spec.js b/tests/handlebars/prettier-ignore/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-prettier-ignore/jsfmt.spec.js
rename to tests/handlebars/prettier-ignore/jsfmt.spec.js
diff --git a/tests/handlebars-prettier-ignore/prettier-ignore.hbs b/tests/handlebars/prettier-ignore/prettier-ignore.hbs
similarity index 100%
rename from tests/handlebars-prettier-ignore/prettier-ignore.hbs
rename to tests/handlebars/prettier-ignore/prettier-ignore.hbs
diff --git a/tests/handlebars-sub-expression/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/sub-expression/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-sub-expression/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/sub-expression/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-sub-expression/jsfmt.spec.js b/tests/handlebars/sub-expression/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-sub-expression/jsfmt.spec.js
rename to tests/handlebars/sub-expression/jsfmt.spec.js
diff --git a/tests/handlebars-sub-expression/sub-expressions.hbs b/tests/handlebars/sub-expression/sub-expressions.hbs
similarity index 100%
rename from tests/handlebars-sub-expression/sub-expressions.hbs
rename to tests/handlebars/sub-expression/sub-expressions.hbs
diff --git a/tests/handlebars-text-wrap/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/text-wrap/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-text-wrap/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/text-wrap/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-text-wrap/jsfmt.spec.js b/tests/handlebars/text-wrap/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-text-wrap/jsfmt.spec.js
rename to tests/handlebars/text-wrap/jsfmt.spec.js
diff --git a/tests/handlebars-text-wrap/test.hbs b/tests/handlebars/text-wrap/test.hbs
similarity index 100%
rename from tests/handlebars-text-wrap/test.hbs
rename to tests/handlebars/text-wrap/test.hbs
diff --git a/tests/handlebars-venerable/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/venerable/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-venerable/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/venerable/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-venerable/jsfmt.spec.js b/tests/handlebars/venerable/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-venerable/jsfmt.spec.js
rename to tests/handlebars/venerable/jsfmt.spec.js
diff --git a/tests/handlebars-venerable/template.html b/tests/handlebars/venerable/template.html
similarity index 100%
rename from tests/handlebars-venerable/template.html
rename to tests/handlebars/venerable/template.html
diff --git a/tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/whitespace/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/handlebars-whitespace/__snapshots__/jsfmt.spec.js.snap
rename to tests/handlebars/whitespace/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/handlebars-whitespace/basics.hbs b/tests/handlebars/whitespace/basics.hbs
similarity index 100%
rename from tests/handlebars-whitespace/basics.hbs
rename to tests/handlebars/whitespace/basics.hbs
diff --git a/tests/handlebars-whitespace/boss.hbs b/tests/handlebars/whitespace/boss.hbs
similarity index 100%
rename from tests/handlebars-whitespace/boss.hbs
rename to tests/handlebars/whitespace/boss.hbs
diff --git a/tests/handlebars-whitespace/curly.hbs b/tests/handlebars/whitespace/curly.hbs
similarity index 100%
rename from tests/handlebars-whitespace/curly.hbs
rename to tests/handlebars/whitespace/curly.hbs
diff --git a/tests/handlebars-whitespace/display-inline-block.hbs b/tests/handlebars/whitespace/display-inline-block.hbs
similarity index 100%
rename from tests/handlebars-whitespace/display-inline-block.hbs
rename to tests/handlebars/whitespace/display-inline-block.hbs
diff --git a/tests/handlebars-whitespace/display-none.hbs b/tests/handlebars/whitespace/display-none.hbs
similarity index 100%
rename from tests/handlebars-whitespace/display-none.hbs
rename to tests/handlebars/whitespace/display-none.hbs
diff --git a/tests/handlebars-whitespace/fill.hbs b/tests/handlebars/whitespace/fill.hbs
similarity index 100%
rename from tests/handlebars-whitespace/fill.hbs
rename to tests/handlebars/whitespace/fill.hbs
diff --git a/tests/handlebars-whitespace/inline-element.hbs b/tests/handlebars/whitespace/inline-element.hbs
similarity index 100%
rename from tests/handlebars-whitespace/inline-element.hbs
rename to tests/handlebars/whitespace/inline-element.hbs
diff --git a/tests/handlebars-whitespace/jsfmt.spec.js b/tests/handlebars/whitespace/jsfmt.spec.js
similarity index 100%
rename from tests/handlebars-whitespace/jsfmt.spec.js
rename to tests/handlebars/whitespace/jsfmt.spec.js
diff --git a/tests/handlebars-whitespace/non-breaking-whitespace.hbs b/tests/handlebars/whitespace/non-breaking-whitespace.hbs
similarity index 100%
rename from tests/handlebars-whitespace/non-breaking-whitespace.hbs
rename to tests/handlebars/whitespace/non-breaking-whitespace.hbs
diff --git a/tests/handlebars-whitespace/preserved-spaces-and-breaks.hbs b/tests/handlebars/whitespace/preserved-spaces-and-breaks.hbs
similarity index 100%
rename from tests/handlebars-whitespace/preserved-spaces-and-breaks.hbs
rename to tests/handlebars/whitespace/preserved-spaces-and-breaks.hbs
diff --git a/tests/handlebars-whitespace/punctuation.hbs b/tests/handlebars/whitespace/punctuation.hbs
similarity index 100%
rename from tests/handlebars-whitespace/punctuation.hbs
rename to tests/handlebars/whitespace/punctuation.hbs
diff --git a/tests/handlebars-whitespace/surrounding-linebreak.hbs b/tests/handlebars/whitespace/surrounding-linebreak.hbs
similarity index 100%
rename from tests/handlebars-whitespace/surrounding-linebreak.hbs
rename to tests/handlebars/whitespace/surrounding-linebreak.hbs
diff --git a/tests/handlebars-whitespace/table.hbs b/tests/handlebars/whitespace/table.hbs
similarity index 100%
rename from tests/handlebars-whitespace/table.hbs
rename to tests/handlebars/whitespace/table.hbs
diff --git a/tests/handlebars-whitespace/whitespace-control.hbs b/tests/handlebars/whitespace/whitespace-control.hbs
similarity index 100%
rename from tests/handlebars-whitespace/whitespace-control.hbs
rename to tests/handlebars/whitespace/whitespace-control.hbs
diff --git a/tests/json/__snapshots__/jsfmt.spec.js.snap b/tests/json/json/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/json/__snapshots__/jsfmt.spec.js.snap
rename to tests/json/json/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/json/boolean.json b/tests/json/json/boolean.json
similarity index 100%
rename from tests/json/boolean.json
rename to tests/json/json/boolean.json
diff --git a/tests/json/jsfmt.spec.js b/tests/json/json/jsfmt.spec.js
similarity index 100%
rename from tests/json/jsfmt.spec.js
rename to tests/json/json/jsfmt.spec.js
diff --git a/tests/json/key-value.json b/tests/json/json/key-value.json
similarity index 100%
rename from tests/json/key-value.json
rename to tests/json/json/key-value.json
diff --git a/tests/json/multi-line.json b/tests/json/json/multi-line.json
similarity index 100%
rename from tests/json/multi-line.json
rename to tests/json/json/multi-line.json
diff --git a/tests/json/null.json b/tests/json/json/null.json
similarity index 100%
rename from tests/json/null.json
rename to tests/json/json/null.json
diff --git a/tests/json/number.json b/tests/json/json/number.json
similarity index 100%
rename from tests/json/number.json
rename to tests/json/json/number.json
diff --git a/tests/json/pass1.json b/tests/json/json/pass1.json
similarity index 100%
rename from tests/json/pass1.json
rename to tests/json/json/pass1.json
diff --git a/tests/json/positive-number.json b/tests/json/json/positive-number.json
similarity index 100%
rename from tests/json/positive-number.json
rename to tests/json/json/positive-number.json
diff --git a/tests/json/propertyKey.json b/tests/json/json/propertyKey.json
similarity index 100%
rename from tests/json/propertyKey.json
rename to tests/json/json/propertyKey.json
diff --git a/tests/json/single-line.json b/tests/json/json/single-line.json
similarity index 100%
rename from tests/json/single-line.json
rename to tests/json/json/single-line.json
diff --git a/tests/json/single-quote.json b/tests/json/json/single-quote.json
similarity index 100%
rename from tests/json/single-quote.json
rename to tests/json/json/single-quote.json
diff --git a/tests/json/string.json b/tests/json/json/string.json
similarity index 100%
rename from tests/json/string.json
rename to tests/json/json/string.json
diff --git a/tests/json/trailingComma.notjson b/tests/json/json/trailingComma.notjson
similarity index 100%
rename from tests/json/trailingComma.notjson
rename to tests/json/json/trailingComma.notjson
diff --git a/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/attr-element/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/attr-element/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-attr-element/attr-element.js b/tests/jsx/attr-element/attr-element.js
similarity index 100%
rename from tests/jsx-attr-element/attr-element.js
rename to tests/jsx/attr-element/attr-element.js
diff --git a/tests/jsx-attr-element/jsfmt.spec.js b/tests/jsx/attr-element/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-attr-element/jsfmt.spec.js
rename to tests/jsx/attr-element/jsfmt.spec.js
diff --git a/tests/jsx-do/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/do/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-do/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/do/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-do/do.js b/tests/jsx/do/do.js
similarity index 100%
rename from tests/jsx-do/do.js
rename to tests/jsx/do/do.js
diff --git a/tests/jsx-do/jsfmt.spec.js b/tests/jsx/do/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-do/jsfmt.spec.js
rename to tests/jsx/do/jsfmt.spec.js
diff --git a/tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/escape/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx_escape/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/escape/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_escape/escape.js b/tests/jsx/escape/escape.js
similarity index 100%
rename from tests/jsx_escape/escape.js
rename to tests/jsx/escape/escape.js
diff --git a/tests/jsx_escape/jsfmt.spec.js b/tests/jsx/escape/jsfmt.spec.js
similarity index 100%
rename from tests/jsx_escape/jsfmt.spec.js
rename to tests/jsx/escape/jsfmt.spec.js
diff --git a/tests/jsx_escape/nbsp.js b/tests/jsx/escape/nbsp.js
similarity index 100%
rename from tests/jsx_escape/nbsp.js
rename to tests/jsx/escape/nbsp.js
diff --git a/tests/jsx-fbt/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/fbt/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-fbt/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/fbt/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-fbt/jsfmt.spec.js b/tests/jsx/fbt/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-fbt/jsfmt.spec.js
rename to tests/jsx/fbt/jsfmt.spec.js
diff --git a/tests/jsx-fbt/test.js b/tests/jsx/fbt/test.js
similarity index 100%
rename from tests/jsx-fbt/test.js
rename to tests/jsx/fbt/test.js
diff --git a/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/fragment/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/fragment/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_fragment/fragment.js b/tests/jsx/fragment/fragment.js
similarity index 100%
rename from tests/jsx_fragment/fragment.js
rename to tests/jsx/fragment/fragment.js
diff --git a/tests/jsx-newlines/jsfmt.spec.js b/tests/jsx/fragment/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-newlines/jsfmt.spec.js
rename to tests/jsx/fragment/jsfmt.spec.js
diff --git a/tests/jsx_ignore/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/ignore/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx_ignore/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/ignore/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-split-attrs/jsfmt.spec.js b/tests/jsx/ignore/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-split-attrs/jsfmt.spec.js
rename to tests/jsx/ignore/jsfmt.spec.js
diff --git a/tests/jsx_ignore/jsx_ignore.js b/tests/jsx/ignore/jsx_ignore.js
similarity index 100%
rename from tests/jsx_ignore/jsx_ignore.js
rename to tests/jsx/ignore/jsx_ignore.js
diff --git a/tests/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/jsx/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/jsx/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx/array-iter.js b/tests/jsx/jsx/array-iter.js
similarity index 100%
rename from tests/jsx/array-iter.js
rename to tests/jsx/jsx/array-iter.js
diff --git a/tests/jsx/attr-comments.js b/tests/jsx/jsx/attr-comments.js
similarity index 100%
rename from tests/jsx/attr-comments.js
rename to tests/jsx/jsx/attr-comments.js
diff --git a/tests/jsx/conditional-expression.js b/tests/jsx/jsx/conditional-expression.js
similarity index 100%
rename from tests/jsx/conditional-expression.js
rename to tests/jsx/jsx/conditional-expression.js
diff --git a/tests/jsx/expression.js b/tests/jsx/jsx/expression.js
similarity index 100%
rename from tests/jsx/expression.js
rename to tests/jsx/jsx/expression.js
diff --git a/tests/jsx/flow_fix_me.js b/tests/jsx/jsx/flow_fix_me.js
similarity index 100%
rename from tests/jsx/flow_fix_me.js
rename to tests/jsx/jsx/flow_fix_me.js
diff --git a/tests/jsx/html_escape.js b/tests/jsx/jsx/html_escape.js
similarity index 100%
rename from tests/jsx/html_escape.js
rename to tests/jsx/jsx/html_escape.js
diff --git a/tests/jsx/hug.js b/tests/jsx/jsx/hug.js
similarity index 100%
rename from tests/jsx/hug.js
rename to tests/jsx/jsx/hug.js
diff --git a/tests/jsx/jsfmt.spec.js b/tests/jsx/jsx/jsfmt.spec.js
similarity index 100%
rename from tests/jsx/jsfmt.spec.js
rename to tests/jsx/jsx/jsfmt.spec.js
diff --git a/tests/jsx/logical-expression.js b/tests/jsx/jsx/logical-expression.js
similarity index 100%
rename from tests/jsx/logical-expression.js
rename to tests/jsx/jsx/logical-expression.js
diff --git a/tests/jsx/object-property.js b/tests/jsx/jsx/object-property.js
similarity index 100%
rename from tests/jsx/object-property.js
rename to tests/jsx/jsx/object-property.js
diff --git a/tests/jsx/open-break.js b/tests/jsx/jsx/open-break.js
similarity index 100%
rename from tests/jsx/open-break.js
rename to tests/jsx/jsx/open-break.js
diff --git a/tests/jsx/parens.js b/tests/jsx/jsx/parens.js
similarity index 100%
rename from tests/jsx/parens.js
rename to tests/jsx/jsx/parens.js
diff --git a/tests/jsx/quotes.js b/tests/jsx/jsx/quotes.js
similarity index 100%
rename from tests/jsx/quotes.js
rename to tests/jsx/jsx/quotes.js
diff --git a/tests/jsx/return-statement.js b/tests/jsx/jsx/return-statement.js
similarity index 100%
rename from tests/jsx/return-statement.js
rename to tests/jsx/jsx/return-statement.js
diff --git a/tests/jsx/self-closing.js b/tests/jsx/jsx/self-closing.js
similarity index 100%
rename from tests/jsx/self-closing.js
rename to tests/jsx/jsx/self-closing.js
diff --git a/tests/jsx/spacing.js b/tests/jsx/jsx/spacing.js
similarity index 100%
rename from tests/jsx/spacing.js
rename to tests/jsx/jsx/spacing.js
diff --git a/tests/jsx_last_line/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/last-line/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx_last_line/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/last-line/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_last_line/jsfmt.spec.js b/tests/jsx/last-line/jsfmt.spec.js
similarity index 100%
rename from tests/jsx_last_line/jsfmt.spec.js
rename to tests/jsx/last-line/jsfmt.spec.js
diff --git a/tests/jsx_last_line/last_line.js b/tests/jsx/last-line/last_line.js
similarity index 100%
rename from tests/jsx_last_line/last_line.js
rename to tests/jsx/last-line/last_line.js
diff --git a/tests/jsx_last_line/single_prop_multiline_string.js b/tests/jsx/last-line/single_prop_multiline_string.js
similarity index 100%
rename from tests/jsx_last_line/single_prop_multiline_string.js
rename to tests/jsx/last-line/single_prop_multiline_string.js
diff --git a/tests/jsx-multiline-assign/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/multiline-assign/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-multiline-assign/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/multiline-assign/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-multiline-assign/jsfmt.spec.js b/tests/jsx/multiline-assign/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-multiline-assign/jsfmt.spec.js
rename to tests/jsx/multiline-assign/jsfmt.spec.js
diff --git a/tests/jsx-multiline-assign/test.js b/tests/jsx/multiline-assign/test.js
similarity index 100%
rename from tests/jsx-multiline-assign/test.js
rename to tests/jsx/multiline-assign/test.js
diff --git a/tests/jsx_namespace/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/namespace/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx_namespace/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/namespace/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_namespace/jsfmt.spec.js b/tests/jsx/namespace/jsfmt.spec.js
similarity index 100%
rename from tests/jsx_namespace/jsfmt.spec.js
rename to tests/jsx/namespace/jsfmt.spec.js
diff --git a/tests/jsx_namespace/jsx_namespaced_name.js b/tests/jsx/namespace/jsx_namespaced_name.js
similarity index 100%
rename from tests/jsx_namespace/jsx_namespaced_name.js
rename to tests/jsx/namespace/jsx_namespaced_name.js
diff --git a/tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/newlines/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-newlines/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/newlines/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_fragment/jsfmt.spec.js b/tests/jsx/newlines/jsfmt.spec.js
similarity index 100%
rename from tests/jsx_fragment/jsfmt.spec.js
rename to tests/jsx/newlines/jsfmt.spec.js
diff --git a/tests/jsx-newlines/test.js b/tests/jsx/newlines/test.js
similarity index 100%
rename from tests/jsx-newlines/test.js
rename to tests/jsx/newlines/test.js
diff --git a/tests/jsx-newlines/windows.js b/tests/jsx/newlines/windows.js
similarity index 100%
rename from tests/jsx-newlines/windows.js
rename to tests/jsx/newlines/windows.js
diff --git a/tests/jsx-significant-space/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/significant-space/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-significant-space/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/significant-space/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-significant-space/comments.js b/tests/jsx/significant-space/comments.js
similarity index 100%
rename from tests/jsx-significant-space/comments.js
rename to tests/jsx/significant-space/comments.js
diff --git a/tests/jsx-significant-space/jsfmt.spec.js b/tests/jsx/significant-space/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-significant-space/jsfmt.spec.js
rename to tests/jsx/significant-space/jsfmt.spec.js
diff --git a/tests/jsx-significant-space/test.js b/tests/jsx/significant-space/test.js
similarity index 100%
rename from tests/jsx-significant-space/test.js
rename to tests/jsx/significant-space/test.js
diff --git a/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/split-attrs/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/split-attrs/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_ignore/jsfmt.spec.js b/tests/jsx/split-attrs/jsfmt.spec.js
similarity index 100%
rename from tests/jsx_ignore/jsfmt.spec.js
rename to tests/jsx/split-attrs/jsfmt.spec.js
diff --git a/tests/jsx-split-attrs/test.js b/tests/jsx/split-attrs/test.js
similarity index 100%
rename from tests/jsx-split-attrs/test.js
rename to tests/jsx/split-attrs/test.js
diff --git a/tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/spread/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx_spread/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/spread/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_spread/attribute.js b/tests/jsx/spread/attribute.js
similarity index 100%
rename from tests/jsx_spread/attribute.js
rename to tests/jsx/spread/attribute.js
diff --git a/tests/jsx_spread/child.js b/tests/jsx/spread/child.js
similarity index 100%
rename from tests/jsx_spread/child.js
rename to tests/jsx/spread/child.js
diff --git a/tests/jsx_spread/jsfmt.spec.js b/tests/jsx/spread/jsfmt.spec.js
similarity index 100%
rename from tests/jsx_spread/jsfmt.spec.js
rename to tests/jsx/spread/jsfmt.spec.js
diff --git a/tests/jsx-stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/stateless-arrow-fn/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-stateless-arrow-fn/jsfmt.spec.js b/tests/jsx/stateless-arrow-fn/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-stateless-arrow-fn/jsfmt.spec.js
rename to tests/jsx/stateless-arrow-fn/jsfmt.spec.js
diff --git a/tests/jsx-stateless-arrow-fn/test.js b/tests/jsx/stateless-arrow-fn/test.js
similarity index 100%
rename from tests/jsx-stateless-arrow-fn/test.js
rename to tests/jsx/stateless-arrow-fn/test.js
diff --git a/tests/jsx_template/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/template/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx_template/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/template/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx_template/jsfmt.spec.js b/tests/jsx/template/jsfmt.spec.js
similarity index 100%
rename from tests/jsx_template/jsfmt.spec.js
rename to tests/jsx/template/jsfmt.spec.js
diff --git a/tests/jsx_template/styled-components.js b/tests/jsx/template/styled-components.js
similarity index 100%
rename from tests/jsx_template/styled-components.js
rename to tests/jsx/template/styled-components.js
diff --git a/tests/jsx-text-wrap/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/text-wrap/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/jsx-text-wrap/__snapshots__/jsfmt.spec.js.snap
rename to tests/jsx/text-wrap/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/jsx-text-wrap/jsfmt.spec.js b/tests/jsx/text-wrap/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-text-wrap/jsfmt.spec.js
rename to tests/jsx/text-wrap/jsfmt.spec.js
diff --git a/tests/jsx-text-wrap/test.js b/tests/jsx/text-wrap/test.js
similarity index 100%
rename from tests/jsx-text-wrap/test.js
rename to tests/jsx/text-wrap/test.js
diff --git a/tests/jsx-whitespace/jsfmt.spec.js b/tests/jsx/whitespace/jsfmt.spec.js
similarity index 100%
rename from tests/jsx-whitespace/jsfmt.spec.js
rename to tests/jsx/whitespace/jsfmt.spec.js
diff --git a/tests/markdown_blockquote/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/blockquote/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_blockquote/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/blockquote/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_blockquote/code.md b/tests/markdown/blockquote/code.md
similarity index 100%
rename from tests/markdown_blockquote/code.md
rename to tests/markdown/blockquote/code.md
diff --git a/tests/markdown_blockquote/ignore-code.md b/tests/markdown/blockquote/ignore-code.md
similarity index 100%
rename from tests/markdown_blockquote/ignore-code.md
rename to tests/markdown/blockquote/ignore-code.md
diff --git a/tests/markdown_blockquote/jsfmt.spec.js b/tests/markdown/blockquote/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_blockquote/jsfmt.spec.js
rename to tests/markdown/blockquote/jsfmt.spec.js
diff --git a/tests/markdown_blockquote/nested.md b/tests/markdown/blockquote/nested.md
similarity index 100%
rename from tests/markdown_blockquote/nested.md
rename to tests/markdown/blockquote/nested.md
diff --git a/tests/markdown_blockquote/paragraph.md b/tests/markdown/blockquote/paragraph.md
similarity index 100%
rename from tests/markdown_blockquote/paragraph.md
rename to tests/markdown/blockquote/paragraph.md
diff --git a/tests/markdown_blockquote/simple.md b/tests/markdown/blockquote/simple.md
similarity index 100%
rename from tests/markdown_blockquote/simple.md
rename to tests/markdown/blockquote/simple.md
diff --git a/tests/markdown_break/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/break/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_break/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/break/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_break/jsfmt.spec.js b/tests/markdown/break/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_break/jsfmt.spec.js
rename to tests/markdown/break/jsfmt.spec.js
diff --git a/tests/markdown_break/simple.md b/tests/markdown/break/simple.md
similarity index 100%
rename from tests/markdown_break/simple.md
rename to tests/markdown/break/simple.md
diff --git a/tests/markdown_code/0-indent-js.md b/tests/markdown/code/0-indent-js.md
similarity index 100%
rename from tests/markdown_code/0-indent-js.md
rename to tests/markdown/code/0-indent-js.md
diff --git a/tests/markdown_code/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/code/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_code/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/code/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_code/additional-space.md b/tests/markdown/code/additional-space.md
similarity index 100%
rename from tests/markdown_code/additional-space.md
rename to tests/markdown/code/additional-space.md
diff --git a/tests/markdown_code/backtick.md b/tests/markdown/code/backtick.md
similarity index 100%
rename from tests/markdown_code/backtick.md
rename to tests/markdown/code/backtick.md
diff --git a/tests/markdown_code/format.md b/tests/markdown/code/format.md
similarity index 100%
rename from tests/markdown_code/format.md
rename to tests/markdown/code/format.md
diff --git a/tests/markdown_code/indent.md b/tests/markdown/code/indent.md
similarity index 100%
rename from tests/markdown_code/indent.md
rename to tests/markdown/code/indent.md
diff --git a/tests/markdown_code/jsfmt.spec.js b/tests/markdown/code/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_code/jsfmt.spec.js
rename to tests/markdown/code/jsfmt.spec.js
diff --git a/tests/markdown_code/lang.md b/tests/markdown/code/lang.md
similarity index 100%
rename from tests/markdown_code/lang.md
rename to tests/markdown/code/lang.md
diff --git a/tests/markdown_code/leading-trailing-newlines.md b/tests/markdown/code/leading-trailing-newlines.md
similarity index 100%
rename from tests/markdown_code/leading-trailing-newlines.md
rename to tests/markdown/code/leading-trailing-newlines.md
diff --git a/tests/markdown_code/simple.md b/tests/markdown/code/simple.md
similarity index 100%
rename from tests/markdown_code/simple.md
rename to tests/markdown/code/simple.md
diff --git a/tests/markdown_definition/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/definition/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_definition/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/definition/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_definition/jsfmt.spec.js b/tests/markdown/definition/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_definition/jsfmt.spec.js
rename to tests/markdown/definition/jsfmt.spec.js
diff --git a/tests/markdown_definition/simple.md b/tests/markdown/definition/simple.md
similarity index 100%
rename from tests/markdown_definition/simple.md
rename to tests/markdown/definition/simple.md
diff --git a/tests/markdown_definition/space.md b/tests/markdown/definition/space.md
similarity index 100%
rename from tests/markdown_definition/space.md
rename to tests/markdown/definition/space.md
diff --git a/tests/markdown_definition/title.md b/tests/markdown/definition/title.md
similarity index 100%
rename from tests/markdown_definition/title.md
rename to tests/markdown/definition/title.md
diff --git a/tests/markdown_delete/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/delete/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_delete/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/delete/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_delete/jsfmt.spec.js b/tests/markdown/delete/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_delete/jsfmt.spec.js
rename to tests/markdown/delete/jsfmt.spec.js
diff --git a/tests/markdown_delete/simple.md b/tests/markdown/delete/simple.md
similarity index 100%
rename from tests/markdown_delete/simple.md
rename to tests/markdown/delete/simple.md
diff --git a/tests/markdown_emphasis/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/emphasis/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_emphasis/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/emphasis/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_emphasis/asterisk.md b/tests/markdown/emphasis/asterisk.md
similarity index 100%
rename from tests/markdown_emphasis/asterisk.md
rename to tests/markdown/emphasis/asterisk.md
diff --git a/tests/markdown_emphasis/complex.md b/tests/markdown/emphasis/complex.md
similarity index 100%
rename from tests/markdown_emphasis/complex.md
rename to tests/markdown/emphasis/complex.md
diff --git a/tests/markdown_emphasis/jsfmt.spec.js b/tests/markdown/emphasis/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_emphasis/jsfmt.spec.js
rename to tests/markdown/emphasis/jsfmt.spec.js
diff --git a/tests/markdown_emphasis/special.md b/tests/markdown/emphasis/special.md
similarity index 100%
rename from tests/markdown_emphasis/special.md
rename to tests/markdown/emphasis/special.md
diff --git a/tests/markdown_emphasis/underscore.md b/tests/markdown/emphasis/underscore.md
similarity index 100%
rename from tests/markdown_emphasis/underscore.md
rename to tests/markdown/emphasis/underscore.md
diff --git a/tests/markdown_footnote/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/footnote/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_footnote/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/footnote/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_footnote/jsfmt.spec.js b/tests/markdown/footnote/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_footnote/jsfmt.spec.js
rename to tests/markdown/footnote/jsfmt.spec.js
diff --git a/tests/markdown_footnote/simple.md b/tests/markdown/footnote/simple.md
similarity index 100%
rename from tests/markdown_footnote/simple.md
rename to tests/markdown/footnote/simple.md
diff --git a/tests/markdown_footnoteDefinition/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/footnoteDefinition/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_footnoteDefinition/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/footnoteDefinition/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_footnoteDefinition/jsfmt.spec.js b/tests/markdown/footnoteDefinition/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_footnoteDefinition/jsfmt.spec.js
rename to tests/markdown/footnoteDefinition/jsfmt.spec.js
diff --git a/tests/markdown_footnoteDefinition/long.md b/tests/markdown/footnoteDefinition/long.md
similarity index 100%
rename from tests/markdown_footnoteDefinition/long.md
rename to tests/markdown/footnoteDefinition/long.md
diff --git a/tests/markdown_footnoteDefinition/multiline.md b/tests/markdown/footnoteDefinition/multiline.md
similarity index 100%
rename from tests/markdown_footnoteDefinition/multiline.md
rename to tests/markdown/footnoteDefinition/multiline.md
diff --git a/tests/markdown_footnoteDefinition/sibling.md b/tests/markdown/footnoteDefinition/sibling.md
similarity index 100%
rename from tests/markdown_footnoteDefinition/sibling.md
rename to tests/markdown/footnoteDefinition/sibling.md
diff --git a/tests/markdown_footnoteDefinition/simple.md b/tests/markdown/footnoteDefinition/simple.md
similarity index 100%
rename from tests/markdown_footnoteDefinition/simple.md
rename to tests/markdown/footnoteDefinition/simple.md
diff --git a/tests/markdown_footnoteReference/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/footnoteReference/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_footnoteReference/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/footnoteReference/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_footnoteReference/jsfmt.spec.js b/tests/markdown/footnoteReference/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_footnoteReference/jsfmt.spec.js
rename to tests/markdown/footnoteReference/jsfmt.spec.js
diff --git a/tests/markdown_footnoteReference/simple.md b/tests/markdown/footnoteReference/simple.md
similarity index 100%
rename from tests/markdown_footnoteReference/simple.md
rename to tests/markdown/footnoteReference/simple.md
diff --git a/tests/markdown_heading/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/heading/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_heading/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/heading/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_heading/atx.md b/tests/markdown/heading/atx.md
similarity index 100%
rename from tests/markdown_heading/atx.md
rename to tests/markdown/heading/atx.md
diff --git a/tests/markdown_heading/jsfmt.spec.js b/tests/markdown/heading/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_heading/jsfmt.spec.js
rename to tests/markdown/heading/jsfmt.spec.js
diff --git a/tests/markdown_heading/long-heading.md b/tests/markdown/heading/long-heading.md
similarity index 100%
rename from tests/markdown_heading/long-heading.md
rename to tests/markdown/heading/long-heading.md
diff --git a/tests/markdown_heading/mixed.md b/tests/markdown/heading/mixed.md
similarity index 100%
rename from tests/markdown_heading/mixed.md
rename to tests/markdown/heading/mixed.md
diff --git a/tests/markdown_heading/setext.md b/tests/markdown/heading/setext.md
similarity index 100%
rename from tests/markdown_heading/setext.md
rename to tests/markdown/heading/setext.md
diff --git a/tests/markdown_heading/unbreakable.md b/tests/markdown/heading/unbreakable.md
similarity index 100%
rename from tests/markdown_heading/unbreakable.md
rename to tests/markdown/heading/unbreakable.md
diff --git a/tests/markdown_html/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/html/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_html/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/html/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_html/beginning-tag-after-a-list-item.md b/tests/markdown/html/beginning-tag-after-a-list-item.md
similarity index 100%
rename from tests/markdown_html/beginning-tag-after-a-list-item.md
rename to tests/markdown/html/beginning-tag-after-a-list-item.md
diff --git a/tests/markdown_html/blank-line-between-htmls.md b/tests/markdown/html/blank-line-between-htmls.md
similarity index 100%
rename from tests/markdown_html/blank-line-between-htmls.md
rename to tests/markdown/html/blank-line-between-htmls.md
diff --git a/tests/markdown_html/jsfmt.spec.js b/tests/markdown/html/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_html/jsfmt.spec.js
rename to tests/markdown/html/jsfmt.spec.js
diff --git a/tests/markdown_html/multiline-with-trailing-space.md b/tests/markdown/html/multiline-with-trailing-space.md
similarity index 100%
rename from tests/markdown_html/multiline-with-trailing-space.md
rename to tests/markdown/html/multiline-with-trailing-space.md
diff --git a/tests/markdown_html/multiline.md b/tests/markdown/html/multiline.md
similarity index 100%
rename from tests/markdown_html/multiline.md
rename to tests/markdown/html/multiline.md
diff --git a/tests/markdown_html/simple.md b/tests/markdown/html/simple.md
similarity index 100%
rename from tests/markdown_html/simple.md
rename to tests/markdown/html/simple.md
diff --git a/tests/markdown_ignore/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/ignore/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_ignore/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/ignore/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_ignore/indented.md b/tests/markdown/ignore/indented.md
similarity index 100%
rename from tests/markdown_ignore/indented.md
rename to tests/markdown/ignore/indented.md
diff --git a/tests/markdown_ignore/jsfmt.spec.js b/tests/markdown/ignore/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_ignore/jsfmt.spec.js
rename to tests/markdown/ignore/jsfmt.spec.js
diff --git a/tests/markdown_ignore/simple.md b/tests/markdown/ignore/simple.md
similarity index 100%
rename from tests/markdown_ignore/simple.md
rename to tests/markdown/ignore/simple.md
diff --git a/tests/markdown_ignore/top-level-range.md b/tests/markdown/ignore/top-level-range.md
similarity index 100%
rename from tests/markdown_ignore/top-level-range.md
rename to tests/markdown/ignore/top-level-range.md
diff --git a/tests/markdown_image/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/image/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_image/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/image/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_image/jsfmt.spec.js b/tests/markdown/image/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_image/jsfmt.spec.js
rename to tests/markdown/image/jsfmt.spec.js
diff --git a/tests/markdown_image/simple.md b/tests/markdown/image/simple.md
similarity index 100%
rename from tests/markdown_image/simple.md
rename to tests/markdown/image/simple.md
diff --git a/tests/markdown_image/title.md b/tests/markdown/image/title.md
similarity index 100%
rename from tests/markdown_image/title.md
rename to tests/markdown/image/title.md
diff --git a/tests/markdown_imageReference/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/imageReference/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_imageReference/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/imageReference/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_imageReference/collapsed.md b/tests/markdown/imageReference/collapsed.md
similarity index 100%
rename from tests/markdown_imageReference/collapsed.md
rename to tests/markdown/imageReference/collapsed.md
diff --git a/tests/markdown_imageReference/full-no-alt.md b/tests/markdown/imageReference/full-no-alt.md
similarity index 100%
rename from tests/markdown_imageReference/full-no-alt.md
rename to tests/markdown/imageReference/full-no-alt.md
diff --git a/tests/markdown_imageReference/full.md b/tests/markdown/imageReference/full.md
similarity index 100%
rename from tests/markdown_imageReference/full.md
rename to tests/markdown/imageReference/full.md
diff --git a/tests/markdown_imageReference/jsfmt.spec.js b/tests/markdown/imageReference/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_imageReference/jsfmt.spec.js
rename to tests/markdown/imageReference/jsfmt.spec.js
diff --git a/tests/markdown_imageReference/shortcut.md b/tests/markdown/imageReference/shortcut.md
similarity index 100%
rename from tests/markdown_imageReference/shortcut.md
rename to tests/markdown/imageReference/shortcut.md
diff --git a/tests/markdown_indentation/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/indentation/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_indentation/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/indentation/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_indentation/example.md b/tests/markdown/indentation/example.md
similarity index 100%
rename from tests/markdown_indentation/example.md
rename to tests/markdown/indentation/example.md
diff --git a/tests/markdown_indentation/jsfmt.spec.js b/tests/markdown/indentation/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_indentation/jsfmt.spec.js
rename to tests/markdown/indentation/jsfmt.spec.js
diff --git a/tests/markdown_inlineCode/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/inlineCode/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_inlineCode/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/inlineCode/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_inlineCode/backtick.md b/tests/markdown/inlineCode/backtick.md
similarity index 100%
rename from tests/markdown_inlineCode/backtick.md
rename to tests/markdown/inlineCode/backtick.md
diff --git a/tests/markdown_inlineCode/cjk.md b/tests/markdown/inlineCode/cjk.md
similarity index 100%
rename from tests/markdown_inlineCode/cjk.md
rename to tests/markdown/inlineCode/cjk.md
diff --git a/tests/markdown_inlineCode/escape.md b/tests/markdown/inlineCode/escape.md
similarity index 100%
rename from tests/markdown_inlineCode/escape.md
rename to tests/markdown/inlineCode/escape.md
diff --git a/tests/markdown_inlineCode/jsfmt.spec.js b/tests/markdown/inlineCode/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_inlineCode/jsfmt.spec.js
rename to tests/markdown/inlineCode/jsfmt.spec.js
diff --git a/tests/markdown_inlineCode/long.md b/tests/markdown/inlineCode/long.md
similarity index 100%
rename from tests/markdown_inlineCode/long.md
rename to tests/markdown/inlineCode/long.md
diff --git a/tests/markdown_inlineCode/simple.md b/tests/markdown/inlineCode/simple.md
similarity index 100%
rename from tests/markdown_inlineCode/simple.md
rename to tests/markdown/inlineCode/simple.md
diff --git a/tests/markdown_jsx_semi/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/jsx-semi/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_jsx_semi/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/jsx-semi/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_jsx_semi/jsfmt.spec.js b/tests/markdown/jsx-semi/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_jsx_semi/jsfmt.spec.js
rename to tests/markdown/jsx-semi/jsfmt.spec.js
diff --git a/tests/markdown_jsx_semi/semi.md b/tests/markdown/jsx-semi/semi.md
similarity index 100%
rename from tests/markdown_jsx_semi/semi.md
rename to tests/markdown/jsx-semi/semi.md
diff --git a/tests/markdown_link/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/link/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_link/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/link/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_link/autolink.md b/tests/markdown/link/autolink.md
similarity index 100%
rename from tests/markdown_link/autolink.md
rename to tests/markdown/link/autolink.md
diff --git a/tests/markdown_link/entity.md b/tests/markdown/link/entity.md
similarity index 100%
rename from tests/markdown_link/entity.md
rename to tests/markdown/link/entity.md
diff --git a/tests/markdown/jsfmt.spec.js b/tests/markdown/link/jsfmt.spec.js
similarity index 100%
rename from tests/markdown/jsfmt.spec.js
rename to tests/markdown/link/jsfmt.spec.js
diff --git a/tests/markdown_link/long.md b/tests/markdown/link/long.md
similarity index 100%
rename from tests/markdown_link/long.md
rename to tests/markdown/link/long.md
diff --git a/tests/markdown_link/simple.md b/tests/markdown/link/simple.md
similarity index 100%
rename from tests/markdown_link/simple.md
rename to tests/markdown/link/simple.md
diff --git a/tests/markdown_link/title.md b/tests/markdown/link/title.md
similarity index 100%
rename from tests/markdown_link/title.md
rename to tests/markdown/link/title.md
diff --git a/tests/markdown_link/url.md b/tests/markdown/link/url.md
similarity index 100%
rename from tests/markdown_link/url.md
rename to tests/markdown/link/url.md
diff --git a/tests/markdown_linkReference/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/linkReference/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_linkReference/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/linkReference/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_linkReference/cjk.md b/tests/markdown/linkReference/cjk.md
similarity index 100%
rename from tests/markdown_linkReference/cjk.md
rename to tests/markdown/linkReference/cjk.md
diff --git a/tests/markdown_linkReference/collapsed.md b/tests/markdown/linkReference/collapsed.md
similarity index 100%
rename from tests/markdown_linkReference/collapsed.md
rename to tests/markdown/linkReference/collapsed.md
diff --git a/tests/markdown_linkReference/definition.md b/tests/markdown/linkReference/definition.md
similarity index 100%
rename from tests/markdown_linkReference/definition.md
rename to tests/markdown/linkReference/definition.md
diff --git a/tests/markdown_linkReference/full.md b/tests/markdown/linkReference/full.md
similarity index 100%
rename from tests/markdown_linkReference/full.md
rename to tests/markdown/linkReference/full.md
diff --git a/tests/markdown_linkReference/jsfmt.spec.js b/tests/markdown/linkReference/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_linkReference/jsfmt.spec.js
rename to tests/markdown/linkReference/jsfmt.spec.js
diff --git a/tests/markdown_linkReference/shortcut.md b/tests/markdown/linkReference/shortcut.md
similarity index 100%
rename from tests/markdown_linkReference/shortcut.md
rename to tests/markdown/linkReference/shortcut.md
diff --git a/tests/markdown_linkReference/title.md b/tests/markdown/linkReference/title.md
similarity index 100%
rename from tests/markdown_linkReference/title.md
rename to tests/markdown/linkReference/title.md
diff --git a/tests/markdown_liquid/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/liquid/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_liquid/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/liquid/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_liquid/example-1.md b/tests/markdown/liquid/example-1.md
similarity index 100%
rename from tests/markdown_liquid/example-1.md
rename to tests/markdown/liquid/example-1.md
diff --git a/tests/markdown_liquid/jsfmt.spec.js b/tests/markdown/liquid/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_liquid/jsfmt.spec.js
rename to tests/markdown/liquid/jsfmt.spec.js
diff --git a/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/list/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_list/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/list/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_list/align.md b/tests/markdown/list/align.md
similarity index 100%
rename from tests/markdown_list/align.md
rename to tests/markdown/list/align.md
diff --git a/tests/markdown_list/checkbox.md b/tests/markdown/list/checkbox.md
similarity index 100%
rename from tests/markdown_list/checkbox.md
rename to tests/markdown/list/checkbox.md
diff --git a/tests/markdown_list/git-diff-friendly.md b/tests/markdown/list/git-diff-friendly.md
similarity index 100%
rename from tests/markdown_list/git-diff-friendly.md
rename to tests/markdown/list/git-diff-friendly.md
diff --git a/tests/markdown_list/indent.md b/tests/markdown/list/indent.md
similarity index 100%
rename from tests/markdown_list/indent.md
rename to tests/markdown/list/indent.md
diff --git a/tests/markdown_list/interrupt.md b/tests/markdown/list/interrupt.md
similarity index 100%
rename from tests/markdown_list/interrupt.md
rename to tests/markdown/list/interrupt.md
diff --git a/tests/markdown_list/issue-7846.md b/tests/markdown/list/issue-7846.md
similarity index 100%
rename from tests/markdown_list/issue-7846.md
rename to tests/markdown/list/issue-7846.md
diff --git a/tests/markdown_list/jsfmt.spec.js b/tests/markdown/list/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_list/jsfmt.spec.js
rename to tests/markdown/list/jsfmt.spec.js
diff --git a/tests/markdown_list/long-paragraph.md b/tests/markdown/list/long-paragraph.md
similarity index 100%
rename from tests/markdown_list/long-paragraph.md
rename to tests/markdown/list/long-paragraph.md
diff --git a/tests/markdown_list/loose.md b/tests/markdown/list/loose.md
similarity index 100%
rename from tests/markdown_list/loose.md
rename to tests/markdown/list/loose.md
diff --git a/tests/markdown_list/multiline.md b/tests/markdown/list/multiline.md
similarity index 100%
rename from tests/markdown_list/multiline.md
rename to tests/markdown/list/multiline.md
diff --git a/tests/markdown_list/nested-checkbox.md b/tests/markdown/list/nested-checkbox.md
similarity index 100%
rename from tests/markdown_list/nested-checkbox.md
rename to tests/markdown/list/nested-checkbox.md
diff --git a/tests/markdown_list/nested.md b/tests/markdown/list/nested.md
similarity index 100%
rename from tests/markdown_list/nested.md
rename to tests/markdown/list/nested.md
diff --git a/tests/markdown_list/ordered.md b/tests/markdown/list/ordered.md
similarity index 100%
rename from tests/markdown_list/ordered.md
rename to tests/markdown/list/ordered.md
diff --git a/tests/markdown_list/separate.md b/tests/markdown/list/separate.md
similarity index 100%
rename from tests/markdown_list/separate.md
rename to tests/markdown/list/separate.md
diff --git a/tests/markdown_list/simple.md b/tests/markdown/list/simple.md
similarity index 100%
rename from tests/markdown_list/simple.md
rename to tests/markdown/list/simple.md
diff --git a/tests/markdown_list/start.md b/tests/markdown/list/start.md
similarity index 100%
rename from tests/markdown_list/start.md
rename to tests/markdown/list/start.md
diff --git a/tests/markdown_long_table/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/long-table/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_long_table/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/long-table/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_long_table/jsfmt.spec.js b/tests/markdown/long-table/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_long_table/jsfmt.spec.js
rename to tests/markdown/long-table/jsfmt.spec.js
diff --git a/tests/markdown_long_table/long-table.md b/tests/markdown/long-table/long-table.md
similarity index 100%
rename from tests/markdown_long_table/long-table.md
rename to tests/markdown/long-table/long-table.md
diff --git a/tests/markdown/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/markdown/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/markdown/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_link/jsfmt.spec.js b/tests/markdown/markdown/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_link/jsfmt.spec.js
rename to tests/markdown/markdown/jsfmt.spec.js
diff --git a/tests/markdown/real-world-case.md b/tests/markdown/markdown/real-world-case.md
similarity index 100%
rename from tests/markdown/real-world-case.md
rename to tests/markdown/markdown/real-world-case.md
diff --git a/tests/markdown/test-case.md b/tests/markdown/markdown/test-case.md
similarity index 100%
rename from tests/markdown/test-case.md
rename to tests/markdown/markdown/test-case.md
diff --git a/tests/markdown_math/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/math/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_math/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/math/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_math/dollar-sign.md b/tests/markdown/math/dollar-sign.md
similarity index 100%
rename from tests/markdown_math/dollar-sign.md
rename to tests/markdown/math/dollar-sign.md
diff --git a/tests/markdown_math/empty-block.md b/tests/markdown/math/empty-block.md
similarity index 100%
rename from tests/markdown_math/empty-block.md
rename to tests/markdown/math/empty-block.md
diff --git a/tests/markdown_math/jsfmt.spec.js b/tests/markdown/math/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_math/jsfmt.spec.js
rename to tests/markdown/math/jsfmt.spec.js
diff --git a/tests/markdown_math/math-like.md b/tests/markdown/math/math-like.md
similarity index 100%
rename from tests/markdown_math/math-like.md
rename to tests/markdown/math/math-like.md
diff --git a/tests/markdown_math/remark-math.md b/tests/markdown/math/remark-math.md
similarity index 100%
rename from tests/markdown_math/remark-math.md
rename to tests/markdown/math/remark-math.md
diff --git a/tests/multiparser_markdown_css/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/multiparser-css/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/multiparser_markdown_css/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/multiparser-css/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/multiparser_markdown_css/css-comment.md b/tests/markdown/multiparser-css/css-comment.md
similarity index 100%
rename from tests/multiparser_markdown_css/css-comment.md
rename to tests/markdown/multiparser-css/css-comment.md
diff --git a/tests/multiparser_markdown_css/jsfmt.spec.js b/tests/markdown/multiparser-css/jsfmt.spec.js
similarity index 100%
rename from tests/multiparser_markdown_css/jsfmt.spec.js
rename to tests/markdown/multiparser-css/jsfmt.spec.js
diff --git a/tests/multiparser_markdown_js/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/multiparser-js/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/multiparser_markdown_js/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/multiparser-js/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/multiparser_markdown_js/jsfmt.spec.js b/tests/markdown/multiparser-js/jsfmt.spec.js
similarity index 100%
rename from tests/multiparser_markdown_js/jsfmt.spec.js
rename to tests/markdown/multiparser-js/jsfmt.spec.js
diff --git a/tests/multiparser_markdown_js/jsx-comment.md b/tests/markdown/multiparser-js/jsx-comment.md
similarity index 100%
rename from tests/multiparser_markdown_js/jsx-comment.md
rename to tests/markdown/multiparser-js/jsx-comment.md
diff --git a/tests/multiparser_markdown_js/markdown-preview-enhanced.md b/tests/markdown/multiparser-js/markdown-preview-enhanced.md
similarity index 100%
rename from tests/multiparser_markdown_js/markdown-preview-enhanced.md
rename to tests/markdown/multiparser-js/markdown-preview-enhanced.md
diff --git a/tests/multiparser_markdown_js/trailing-comma.md b/tests/markdown/multiparser-js/trailing-comma.md
similarity index 100%
rename from tests/multiparser_markdown_js/trailing-comma.md
rename to tests/markdown/multiparser-js/trailing-comma.md
diff --git a/tests/multiparser_markdown_json/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/multiparser-json/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/multiparser_markdown_json/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/multiparser-json/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/multiparser_markdown_json/jsfmt.spec.js b/tests/markdown/multiparser-json/jsfmt.spec.js
similarity index 100%
rename from tests/multiparser_markdown_json/jsfmt.spec.js
rename to tests/markdown/multiparser-json/jsfmt.spec.js
diff --git a/tests/multiparser_markdown_json/jsonc.md b/tests/markdown/multiparser-json/jsonc.md
similarity index 100%
rename from tests/multiparser_markdown_json/jsonc.md
rename to tests/markdown/multiparser-json/jsonc.md
diff --git a/tests/multiparser_markdown_json/trailing_comma.md b/tests/markdown/multiparser-json/trailing_comma.md
similarity index 100%
rename from tests/multiparser_markdown_json/trailing_comma.md
rename to tests/markdown/multiparser-json/trailing_comma.md
diff --git a/tests/markdown_paragraph/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/paragraph/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_paragraph/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/paragraph/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_paragraph/cjk.md b/tests/markdown/paragraph/cjk.md
similarity index 100%
rename from tests/markdown_paragraph/cjk.md
rename to tests/markdown/paragraph/cjk.md
diff --git a/tests/markdown_paragraph/inline-nodes.md b/tests/markdown/paragraph/inline-nodes.md
similarity index 100%
rename from tests/markdown_paragraph/inline-nodes.md
rename to tests/markdown/paragraph/inline-nodes.md
diff --git a/tests/markdown_paragraph/jsfmt.spec.js b/tests/markdown/paragraph/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_paragraph/jsfmt.spec.js
rename to tests/markdown/paragraph/jsfmt.spec.js
diff --git a/tests/markdown_paragraph/lorem.md b/tests/markdown/paragraph/lorem.md
similarity index 100%
rename from tests/markdown_paragraph/lorem.md
rename to tests/markdown/paragraph/lorem.md
diff --git a/tests/markdown_paragraph/simple.md b/tests/markdown/paragraph/simple.md
similarity index 100%
rename from tests/markdown_paragraph/simple.md
rename to tests/markdown/paragraph/simple.md
diff --git a/tests/markdown_paragraph/special-prefix.md b/tests/markdown/paragraph/special-prefix.md
similarity index 100%
rename from tests/markdown_paragraph/special-prefix.md
rename to tests/markdown/paragraph/special-prefix.md
diff --git a/tests/markdown_paragraph/whitespace.md b/tests/markdown/paragraph/whitespace.md
similarity index 100%
rename from tests/markdown_paragraph/whitespace.md
rename to tests/markdown/paragraph/whitespace.md
diff --git a/tests/markdown_spec/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/spec/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_spec/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/spec/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_spec/example-1.md b/tests/markdown/spec/example-1.md
similarity index 100%
rename from tests/markdown_spec/example-1.md
rename to tests/markdown/spec/example-1.md
diff --git a/tests/markdown_spec/example-10.md b/tests/markdown/spec/example-10.md
similarity index 100%
rename from tests/markdown_spec/example-10.md
rename to tests/markdown/spec/example-10.md
diff --git a/tests/markdown_spec/example-100.md b/tests/markdown/spec/example-100.md
similarity index 100%
rename from tests/markdown_spec/example-100.md
rename to tests/markdown/spec/example-100.md
diff --git a/tests/markdown_spec/example-101.md b/tests/markdown/spec/example-101.md
similarity index 100%
rename from tests/markdown_spec/example-101.md
rename to tests/markdown/spec/example-101.md
diff --git a/tests/markdown_spec/example-102.md b/tests/markdown/spec/example-102.md
similarity index 100%
rename from tests/markdown_spec/example-102.md
rename to tests/markdown/spec/example-102.md
diff --git a/tests/markdown_spec/example-103.md b/tests/markdown/spec/example-103.md
similarity index 100%
rename from tests/markdown_spec/example-103.md
rename to tests/markdown/spec/example-103.md
diff --git a/tests/markdown_spec/example-104.md b/tests/markdown/spec/example-104.md
similarity index 100%
rename from tests/markdown_spec/example-104.md
rename to tests/markdown/spec/example-104.md
diff --git a/tests/markdown_spec/example-105.md b/tests/markdown/spec/example-105.md
similarity index 100%
rename from tests/markdown_spec/example-105.md
rename to tests/markdown/spec/example-105.md
diff --git a/tests/markdown_spec/example-106.md b/tests/markdown/spec/example-106.md
similarity index 100%
rename from tests/markdown_spec/example-106.md
rename to tests/markdown/spec/example-106.md
diff --git a/tests/markdown_spec/example-107.md b/tests/markdown/spec/example-107.md
similarity index 100%
rename from tests/markdown_spec/example-107.md
rename to tests/markdown/spec/example-107.md
diff --git a/tests/markdown_spec/example-108.md b/tests/markdown/spec/example-108.md
similarity index 100%
rename from tests/markdown_spec/example-108.md
rename to tests/markdown/spec/example-108.md
diff --git a/tests/markdown_spec/example-109.md b/tests/markdown/spec/example-109.md
similarity index 100%
rename from tests/markdown_spec/example-109.md
rename to tests/markdown/spec/example-109.md
diff --git a/tests/markdown_spec/example-11.md b/tests/markdown/spec/example-11.md
similarity index 100%
rename from tests/markdown_spec/example-11.md
rename to tests/markdown/spec/example-11.md
diff --git a/tests/markdown_spec/example-110.md b/tests/markdown/spec/example-110.md
similarity index 100%
rename from tests/markdown_spec/example-110.md
rename to tests/markdown/spec/example-110.md
diff --git a/tests/markdown_spec/example-111.md b/tests/markdown/spec/example-111.md
similarity index 100%
rename from tests/markdown_spec/example-111.md
rename to tests/markdown/spec/example-111.md
diff --git a/tests/markdown_spec/example-112.md b/tests/markdown/spec/example-112.md
similarity index 100%
rename from tests/markdown_spec/example-112.md
rename to tests/markdown/spec/example-112.md
diff --git a/tests/markdown_spec/example-113.md b/tests/markdown/spec/example-113.md
similarity index 100%
rename from tests/markdown_spec/example-113.md
rename to tests/markdown/spec/example-113.md
diff --git a/tests/markdown_spec/example-114.md b/tests/markdown/spec/example-114.md
similarity index 100%
rename from tests/markdown_spec/example-114.md
rename to tests/markdown/spec/example-114.md
diff --git a/tests/markdown_spec/example-115.md b/tests/markdown/spec/example-115.md
similarity index 100%
rename from tests/markdown_spec/example-115.md
rename to tests/markdown/spec/example-115.md
diff --git a/tests/markdown_spec/example-116.md b/tests/markdown/spec/example-116.md
similarity index 100%
rename from tests/markdown_spec/example-116.md
rename to tests/markdown/spec/example-116.md
diff --git a/tests/markdown_spec/example-117.md b/tests/markdown/spec/example-117.md
similarity index 100%
rename from tests/markdown_spec/example-117.md
rename to tests/markdown/spec/example-117.md
diff --git a/tests/markdown_spec/example-118.md b/tests/markdown/spec/example-118.md
similarity index 100%
rename from tests/markdown_spec/example-118.md
rename to tests/markdown/spec/example-118.md
diff --git a/tests/markdown_spec/example-119.md b/tests/markdown/spec/example-119.md
similarity index 100%
rename from tests/markdown_spec/example-119.md
rename to tests/markdown/spec/example-119.md
diff --git a/tests/markdown_spec/example-12.md b/tests/markdown/spec/example-12.md
similarity index 100%
rename from tests/markdown_spec/example-12.md
rename to tests/markdown/spec/example-12.md
diff --git a/tests/markdown_spec/example-120.md b/tests/markdown/spec/example-120.md
similarity index 100%
rename from tests/markdown_spec/example-120.md
rename to tests/markdown/spec/example-120.md
diff --git a/tests/markdown_spec/example-121.md b/tests/markdown/spec/example-121.md
similarity index 100%
rename from tests/markdown_spec/example-121.md
rename to tests/markdown/spec/example-121.md
diff --git a/tests/markdown_spec/example-122.md b/tests/markdown/spec/example-122.md
similarity index 100%
rename from tests/markdown_spec/example-122.md
rename to tests/markdown/spec/example-122.md
diff --git a/tests/markdown_spec/example-123.md b/tests/markdown/spec/example-123.md
similarity index 100%
rename from tests/markdown_spec/example-123.md
rename to tests/markdown/spec/example-123.md
diff --git a/tests/markdown_spec/example-124.md b/tests/markdown/spec/example-124.md
similarity index 100%
rename from tests/markdown_spec/example-124.md
rename to tests/markdown/spec/example-124.md
diff --git a/tests/markdown_spec/example-125.md b/tests/markdown/spec/example-125.md
similarity index 100%
rename from tests/markdown_spec/example-125.md
rename to tests/markdown/spec/example-125.md
diff --git a/tests/markdown_spec/example-126.md b/tests/markdown/spec/example-126.md
similarity index 100%
rename from tests/markdown_spec/example-126.md
rename to tests/markdown/spec/example-126.md
diff --git a/tests/markdown_spec/example-127.md b/tests/markdown/spec/example-127.md
similarity index 100%
rename from tests/markdown_spec/example-127.md
rename to tests/markdown/spec/example-127.md
diff --git a/tests/markdown_spec/example-128.md b/tests/markdown/spec/example-128.md
similarity index 100%
rename from tests/markdown_spec/example-128.md
rename to tests/markdown/spec/example-128.md
diff --git a/tests/markdown_spec/example-129.md b/tests/markdown/spec/example-129.md
similarity index 100%
rename from tests/markdown_spec/example-129.md
rename to tests/markdown/spec/example-129.md
diff --git a/tests/markdown_spec/example-13.md b/tests/markdown/spec/example-13.md
similarity index 100%
rename from tests/markdown_spec/example-13.md
rename to tests/markdown/spec/example-13.md
diff --git a/tests/markdown_spec/example-130.md b/tests/markdown/spec/example-130.md
similarity index 100%
rename from tests/markdown_spec/example-130.md
rename to tests/markdown/spec/example-130.md
diff --git a/tests/markdown_spec/example-131.md b/tests/markdown/spec/example-131.md
similarity index 100%
rename from tests/markdown_spec/example-131.md
rename to tests/markdown/spec/example-131.md
diff --git a/tests/markdown_spec/example-132.md b/tests/markdown/spec/example-132.md
similarity index 100%
rename from tests/markdown_spec/example-132.md
rename to tests/markdown/spec/example-132.md
diff --git a/tests/markdown_spec/example-133.md b/tests/markdown/spec/example-133.md
similarity index 100%
rename from tests/markdown_spec/example-133.md
rename to tests/markdown/spec/example-133.md
diff --git a/tests/markdown_spec/example-134.md b/tests/markdown/spec/example-134.md
similarity index 100%
rename from tests/markdown_spec/example-134.md
rename to tests/markdown/spec/example-134.md
diff --git a/tests/markdown_spec/example-135.md b/tests/markdown/spec/example-135.md
similarity index 100%
rename from tests/markdown_spec/example-135.md
rename to tests/markdown/spec/example-135.md
diff --git a/tests/markdown_spec/example-136.md b/tests/markdown/spec/example-136.md
similarity index 100%
rename from tests/markdown_spec/example-136.md
rename to tests/markdown/spec/example-136.md
diff --git a/tests/markdown_spec/example-137.md b/tests/markdown/spec/example-137.md
similarity index 100%
rename from tests/markdown_spec/example-137.md
rename to tests/markdown/spec/example-137.md
diff --git a/tests/markdown_spec/example-138.md b/tests/markdown/spec/example-138.md
similarity index 100%
rename from tests/markdown_spec/example-138.md
rename to tests/markdown/spec/example-138.md
diff --git a/tests/markdown_spec/example-139.md b/tests/markdown/spec/example-139.md
similarity index 100%
rename from tests/markdown_spec/example-139.md
rename to tests/markdown/spec/example-139.md
diff --git a/tests/markdown_spec/example-14.md b/tests/markdown/spec/example-14.md
similarity index 100%
rename from tests/markdown_spec/example-14.md
rename to tests/markdown/spec/example-14.md
diff --git a/tests/markdown_spec/example-140.md b/tests/markdown/spec/example-140.md
similarity index 100%
rename from tests/markdown_spec/example-140.md
rename to tests/markdown/spec/example-140.md
diff --git a/tests/markdown_spec/example-141.md b/tests/markdown/spec/example-141.md
similarity index 100%
rename from tests/markdown_spec/example-141.md
rename to tests/markdown/spec/example-141.md
diff --git a/tests/markdown_spec/example-142.md b/tests/markdown/spec/example-142.md
similarity index 100%
rename from tests/markdown_spec/example-142.md
rename to tests/markdown/spec/example-142.md
diff --git a/tests/markdown_spec/example-143.md b/tests/markdown/spec/example-143.md
similarity index 100%
rename from tests/markdown_spec/example-143.md
rename to tests/markdown/spec/example-143.md
diff --git a/tests/markdown_spec/example-144.md b/tests/markdown/spec/example-144.md
similarity index 100%
rename from tests/markdown_spec/example-144.md
rename to tests/markdown/spec/example-144.md
diff --git a/tests/markdown_spec/example-145.md b/tests/markdown/spec/example-145.md
similarity index 100%
rename from tests/markdown_spec/example-145.md
rename to tests/markdown/spec/example-145.md
diff --git a/tests/markdown_spec/example-146.md b/tests/markdown/spec/example-146.md
similarity index 100%
rename from tests/markdown_spec/example-146.md
rename to tests/markdown/spec/example-146.md
diff --git a/tests/markdown_spec/example-147.md b/tests/markdown/spec/example-147.md
similarity index 100%
rename from tests/markdown_spec/example-147.md
rename to tests/markdown/spec/example-147.md
diff --git a/tests/markdown_spec/example-148.md b/tests/markdown/spec/example-148.md
similarity index 100%
rename from tests/markdown_spec/example-148.md
rename to tests/markdown/spec/example-148.md
diff --git a/tests/markdown_spec/example-149.md b/tests/markdown/spec/example-149.md
similarity index 100%
rename from tests/markdown_spec/example-149.md
rename to tests/markdown/spec/example-149.md
diff --git a/tests/markdown_spec/example-15.md b/tests/markdown/spec/example-15.md
similarity index 100%
rename from tests/markdown_spec/example-15.md
rename to tests/markdown/spec/example-15.md
diff --git a/tests/markdown_spec/example-150.md b/tests/markdown/spec/example-150.md
similarity index 100%
rename from tests/markdown_spec/example-150.md
rename to tests/markdown/spec/example-150.md
diff --git a/tests/markdown_spec/example-151.md b/tests/markdown/spec/example-151.md
similarity index 100%
rename from tests/markdown_spec/example-151.md
rename to tests/markdown/spec/example-151.md
diff --git a/tests/markdown_spec/example-152.md b/tests/markdown/spec/example-152.md
similarity index 100%
rename from tests/markdown_spec/example-152.md
rename to tests/markdown/spec/example-152.md
diff --git a/tests/markdown_spec/example-153.md b/tests/markdown/spec/example-153.md
similarity index 100%
rename from tests/markdown_spec/example-153.md
rename to tests/markdown/spec/example-153.md
diff --git a/tests/markdown_spec/example-154.md b/tests/markdown/spec/example-154.md
similarity index 100%
rename from tests/markdown_spec/example-154.md
rename to tests/markdown/spec/example-154.md
diff --git a/tests/markdown_spec/example-155.md b/tests/markdown/spec/example-155.md
similarity index 100%
rename from tests/markdown_spec/example-155.md
rename to tests/markdown/spec/example-155.md
diff --git a/tests/markdown_spec/example-156.md b/tests/markdown/spec/example-156.md
similarity index 100%
rename from tests/markdown_spec/example-156.md
rename to tests/markdown/spec/example-156.md
diff --git a/tests/markdown_spec/example-157.md b/tests/markdown/spec/example-157.md
similarity index 100%
rename from tests/markdown_spec/example-157.md
rename to tests/markdown/spec/example-157.md
diff --git a/tests/markdown_spec/example-158.md b/tests/markdown/spec/example-158.md
similarity index 100%
rename from tests/markdown_spec/example-158.md
rename to tests/markdown/spec/example-158.md
diff --git a/tests/markdown_spec/example-159.md b/tests/markdown/spec/example-159.md
similarity index 100%
rename from tests/markdown_spec/example-159.md
rename to tests/markdown/spec/example-159.md
diff --git a/tests/markdown_spec/example-16.md b/tests/markdown/spec/example-16.md
similarity index 100%
rename from tests/markdown_spec/example-16.md
rename to tests/markdown/spec/example-16.md
diff --git a/tests/markdown_spec/example-161.md b/tests/markdown/spec/example-161.md
similarity index 100%
rename from tests/markdown_spec/example-161.md
rename to tests/markdown/spec/example-161.md
diff --git a/tests/markdown_spec/example-162.md b/tests/markdown/spec/example-162.md
similarity index 100%
rename from tests/markdown_spec/example-162.md
rename to tests/markdown/spec/example-162.md
diff --git a/tests/markdown_spec/example-163.md b/tests/markdown/spec/example-163.md
similarity index 100%
rename from tests/markdown_spec/example-163.md
rename to tests/markdown/spec/example-163.md
diff --git a/tests/markdown_spec/example-164.md b/tests/markdown/spec/example-164.md
similarity index 100%
rename from tests/markdown_spec/example-164.md
rename to tests/markdown/spec/example-164.md
diff --git a/tests/markdown_spec/example-165.md b/tests/markdown/spec/example-165.md
similarity index 100%
rename from tests/markdown_spec/example-165.md
rename to tests/markdown/spec/example-165.md
diff --git a/tests/markdown_spec/example-166.md b/tests/markdown/spec/example-166.md
similarity index 100%
rename from tests/markdown_spec/example-166.md
rename to tests/markdown/spec/example-166.md
diff --git a/tests/markdown_spec/example-167.md b/tests/markdown/spec/example-167.md
similarity index 100%
rename from tests/markdown_spec/example-167.md
rename to tests/markdown/spec/example-167.md
diff --git a/tests/markdown_spec/example-168.md b/tests/markdown/spec/example-168.md
similarity index 100%
rename from tests/markdown_spec/example-168.md
rename to tests/markdown/spec/example-168.md
diff --git a/tests/markdown_spec/example-169.md b/tests/markdown/spec/example-169.md
similarity index 100%
rename from tests/markdown_spec/example-169.md
rename to tests/markdown/spec/example-169.md
diff --git a/tests/markdown_spec/example-17.md b/tests/markdown/spec/example-17.md
similarity index 100%
rename from tests/markdown_spec/example-17.md
rename to tests/markdown/spec/example-17.md
diff --git a/tests/markdown_spec/example-170.md b/tests/markdown/spec/example-170.md
similarity index 100%
rename from tests/markdown_spec/example-170.md
rename to tests/markdown/spec/example-170.md
diff --git a/tests/markdown_spec/example-171.md b/tests/markdown/spec/example-171.md
similarity index 100%
rename from tests/markdown_spec/example-171.md
rename to tests/markdown/spec/example-171.md
diff --git a/tests/markdown_spec/example-172.md b/tests/markdown/spec/example-172.md
similarity index 100%
rename from tests/markdown_spec/example-172.md
rename to tests/markdown/spec/example-172.md
diff --git a/tests/markdown_spec/example-173.md b/tests/markdown/spec/example-173.md
similarity index 100%
rename from tests/markdown_spec/example-173.md
rename to tests/markdown/spec/example-173.md
diff --git a/tests/markdown_spec/example-174.md b/tests/markdown/spec/example-174.md
similarity index 100%
rename from tests/markdown_spec/example-174.md
rename to tests/markdown/spec/example-174.md
diff --git a/tests/markdown_spec/example-175.md b/tests/markdown/spec/example-175.md
similarity index 100%
rename from tests/markdown_spec/example-175.md
rename to tests/markdown/spec/example-175.md
diff --git a/tests/markdown_spec/example-176.md b/tests/markdown/spec/example-176.md
similarity index 100%
rename from tests/markdown_spec/example-176.md
rename to tests/markdown/spec/example-176.md
diff --git a/tests/markdown_spec/example-177.md b/tests/markdown/spec/example-177.md
similarity index 100%
rename from tests/markdown_spec/example-177.md
rename to tests/markdown/spec/example-177.md
diff --git a/tests/markdown_spec/example-178.md b/tests/markdown/spec/example-178.md
similarity index 100%
rename from tests/markdown_spec/example-178.md
rename to tests/markdown/spec/example-178.md
diff --git a/tests/markdown_spec/example-179.md b/tests/markdown/spec/example-179.md
similarity index 100%
rename from tests/markdown_spec/example-179.md
rename to tests/markdown/spec/example-179.md
diff --git a/tests/markdown_spec/example-18.md b/tests/markdown/spec/example-18.md
similarity index 100%
rename from tests/markdown_spec/example-18.md
rename to tests/markdown/spec/example-18.md
diff --git a/tests/markdown_spec/example-180.md b/tests/markdown/spec/example-180.md
similarity index 100%
rename from tests/markdown_spec/example-180.md
rename to tests/markdown/spec/example-180.md
diff --git a/tests/markdown_spec/example-181.md b/tests/markdown/spec/example-181.md
similarity index 100%
rename from tests/markdown_spec/example-181.md
rename to tests/markdown/spec/example-181.md
diff --git a/tests/markdown_spec/example-182.md b/tests/markdown/spec/example-182.md
similarity index 100%
rename from tests/markdown_spec/example-182.md
rename to tests/markdown/spec/example-182.md
diff --git a/tests/markdown_spec/example-183.md b/tests/markdown/spec/example-183.md
similarity index 100%
rename from tests/markdown_spec/example-183.md
rename to tests/markdown/spec/example-183.md
diff --git a/tests/markdown_spec/example-184.md b/tests/markdown/spec/example-184.md
similarity index 100%
rename from tests/markdown_spec/example-184.md
rename to tests/markdown/spec/example-184.md
diff --git a/tests/markdown_spec/example-185.md b/tests/markdown/spec/example-185.md
similarity index 100%
rename from tests/markdown_spec/example-185.md
rename to tests/markdown/spec/example-185.md
diff --git a/tests/markdown_spec/example-186.md b/tests/markdown/spec/example-186.md
similarity index 100%
rename from tests/markdown_spec/example-186.md
rename to tests/markdown/spec/example-186.md
diff --git a/tests/markdown_spec/example-187.md b/tests/markdown/spec/example-187.md
similarity index 100%
rename from tests/markdown_spec/example-187.md
rename to tests/markdown/spec/example-187.md
diff --git a/tests/markdown_spec/example-188.md b/tests/markdown/spec/example-188.md
similarity index 100%
rename from tests/markdown_spec/example-188.md
rename to tests/markdown/spec/example-188.md
diff --git a/tests/markdown_spec/example-189.md b/tests/markdown/spec/example-189.md
similarity index 100%
rename from tests/markdown_spec/example-189.md
rename to tests/markdown/spec/example-189.md
diff --git a/tests/markdown_spec/example-19.md b/tests/markdown/spec/example-19.md
similarity index 100%
rename from tests/markdown_spec/example-19.md
rename to tests/markdown/spec/example-19.md
diff --git a/tests/markdown_spec/example-190.md b/tests/markdown/spec/example-190.md
similarity index 100%
rename from tests/markdown_spec/example-190.md
rename to tests/markdown/spec/example-190.md
diff --git a/tests/markdown_spec/example-191.md b/tests/markdown/spec/example-191.md
similarity index 100%
rename from tests/markdown_spec/example-191.md
rename to tests/markdown/spec/example-191.md
diff --git a/tests/markdown_spec/example-192.md b/tests/markdown/spec/example-192.md
similarity index 100%
rename from tests/markdown_spec/example-192.md
rename to tests/markdown/spec/example-192.md
diff --git a/tests/markdown_spec/example-193.md b/tests/markdown/spec/example-193.md
similarity index 100%
rename from tests/markdown_spec/example-193.md
rename to tests/markdown/spec/example-193.md
diff --git a/tests/markdown_spec/example-194.md b/tests/markdown/spec/example-194.md
similarity index 100%
rename from tests/markdown_spec/example-194.md
rename to tests/markdown/spec/example-194.md
diff --git a/tests/markdown_spec/example-195.md b/tests/markdown/spec/example-195.md
similarity index 100%
rename from tests/markdown_spec/example-195.md
rename to tests/markdown/spec/example-195.md
diff --git a/tests/markdown_spec/example-196.md b/tests/markdown/spec/example-196.md
similarity index 100%
rename from tests/markdown_spec/example-196.md
rename to tests/markdown/spec/example-196.md
diff --git a/tests/markdown_spec/example-197.md b/tests/markdown/spec/example-197.md
similarity index 100%
rename from tests/markdown_spec/example-197.md
rename to tests/markdown/spec/example-197.md
diff --git a/tests/markdown_spec/example-198.md b/tests/markdown/spec/example-198.md
similarity index 100%
rename from tests/markdown_spec/example-198.md
rename to tests/markdown/spec/example-198.md
diff --git a/tests/markdown_spec/example-199.md b/tests/markdown/spec/example-199.md
similarity index 100%
rename from tests/markdown_spec/example-199.md
rename to tests/markdown/spec/example-199.md
diff --git a/tests/markdown_spec/example-2.md b/tests/markdown/spec/example-2.md
similarity index 100%
rename from tests/markdown_spec/example-2.md
rename to tests/markdown/spec/example-2.md
diff --git a/tests/markdown_spec/example-20.md b/tests/markdown/spec/example-20.md
similarity index 100%
rename from tests/markdown_spec/example-20.md
rename to tests/markdown/spec/example-20.md
diff --git a/tests/markdown_spec/example-200.md b/tests/markdown/spec/example-200.md
similarity index 100%
rename from tests/markdown_spec/example-200.md
rename to tests/markdown/spec/example-200.md
diff --git a/tests/markdown_spec/example-201.md b/tests/markdown/spec/example-201.md
similarity index 100%
rename from tests/markdown_spec/example-201.md
rename to tests/markdown/spec/example-201.md
diff --git a/tests/markdown_spec/example-202.md b/tests/markdown/spec/example-202.md
similarity index 100%
rename from tests/markdown_spec/example-202.md
rename to tests/markdown/spec/example-202.md
diff --git a/tests/markdown_spec/example-203.md b/tests/markdown/spec/example-203.md
similarity index 100%
rename from tests/markdown_spec/example-203.md
rename to tests/markdown/spec/example-203.md
diff --git a/tests/markdown_spec/example-204.md b/tests/markdown/spec/example-204.md
similarity index 100%
rename from tests/markdown_spec/example-204.md
rename to tests/markdown/spec/example-204.md
diff --git a/tests/markdown_spec/example-205.md b/tests/markdown/spec/example-205.md
similarity index 100%
rename from tests/markdown_spec/example-205.md
rename to tests/markdown/spec/example-205.md
diff --git a/tests/markdown_spec/example-206.md b/tests/markdown/spec/example-206.md
similarity index 100%
rename from tests/markdown_spec/example-206.md
rename to tests/markdown/spec/example-206.md
diff --git a/tests/markdown_spec/example-207.md b/tests/markdown/spec/example-207.md
similarity index 100%
rename from tests/markdown_spec/example-207.md
rename to tests/markdown/spec/example-207.md
diff --git a/tests/markdown_spec/example-208.md b/tests/markdown/spec/example-208.md
similarity index 100%
rename from tests/markdown_spec/example-208.md
rename to tests/markdown/spec/example-208.md
diff --git a/tests/markdown_spec/example-209.md b/tests/markdown/spec/example-209.md
similarity index 100%
rename from tests/markdown_spec/example-209.md
rename to tests/markdown/spec/example-209.md
diff --git a/tests/markdown_spec/example-21.md b/tests/markdown/spec/example-21.md
similarity index 100%
rename from tests/markdown_spec/example-21.md
rename to tests/markdown/spec/example-21.md
diff --git a/tests/markdown_spec/example-210.md b/tests/markdown/spec/example-210.md
similarity index 100%
rename from tests/markdown_spec/example-210.md
rename to tests/markdown/spec/example-210.md
diff --git a/tests/markdown_spec/example-211.md b/tests/markdown/spec/example-211.md
similarity index 100%
rename from tests/markdown_spec/example-211.md
rename to tests/markdown/spec/example-211.md
diff --git a/tests/markdown_spec/example-212.md b/tests/markdown/spec/example-212.md
similarity index 100%
rename from tests/markdown_spec/example-212.md
rename to tests/markdown/spec/example-212.md
diff --git a/tests/markdown_spec/example-213.md b/tests/markdown/spec/example-213.md
similarity index 100%
rename from tests/markdown_spec/example-213.md
rename to tests/markdown/spec/example-213.md
diff --git a/tests/markdown_spec/example-214.md b/tests/markdown/spec/example-214.md
similarity index 100%
rename from tests/markdown_spec/example-214.md
rename to tests/markdown/spec/example-214.md
diff --git a/tests/markdown_spec/example-215.md b/tests/markdown/spec/example-215.md
similarity index 100%
rename from tests/markdown_spec/example-215.md
rename to tests/markdown/spec/example-215.md
diff --git a/tests/markdown_spec/example-216.md b/tests/markdown/spec/example-216.md
similarity index 100%
rename from tests/markdown_spec/example-216.md
rename to tests/markdown/spec/example-216.md
diff --git a/tests/markdown_spec/example-217.md b/tests/markdown/spec/example-217.md
similarity index 100%
rename from tests/markdown_spec/example-217.md
rename to tests/markdown/spec/example-217.md
diff --git a/tests/markdown_spec/example-218.md b/tests/markdown/spec/example-218.md
similarity index 100%
rename from tests/markdown_spec/example-218.md
rename to tests/markdown/spec/example-218.md
diff --git a/tests/markdown_spec/example-219.md b/tests/markdown/spec/example-219.md
similarity index 100%
rename from tests/markdown_spec/example-219.md
rename to tests/markdown/spec/example-219.md
diff --git a/tests/markdown_spec/example-22.md b/tests/markdown/spec/example-22.md
similarity index 100%
rename from tests/markdown_spec/example-22.md
rename to tests/markdown/spec/example-22.md
diff --git a/tests/markdown_spec/example-220.md b/tests/markdown/spec/example-220.md
similarity index 100%
rename from tests/markdown_spec/example-220.md
rename to tests/markdown/spec/example-220.md
diff --git a/tests/markdown_spec/example-221.md b/tests/markdown/spec/example-221.md
similarity index 100%
rename from tests/markdown_spec/example-221.md
rename to tests/markdown/spec/example-221.md
diff --git a/tests/markdown_spec/example-222.md b/tests/markdown/spec/example-222.md
similarity index 100%
rename from tests/markdown_spec/example-222.md
rename to tests/markdown/spec/example-222.md
diff --git a/tests/markdown_spec/example-223.md b/tests/markdown/spec/example-223.md
similarity index 100%
rename from tests/markdown_spec/example-223.md
rename to tests/markdown/spec/example-223.md
diff --git a/tests/markdown_spec/example-224.md b/tests/markdown/spec/example-224.md
similarity index 100%
rename from tests/markdown_spec/example-224.md
rename to tests/markdown/spec/example-224.md
diff --git a/tests/markdown_spec/example-225.md b/tests/markdown/spec/example-225.md
similarity index 100%
rename from tests/markdown_spec/example-225.md
rename to tests/markdown/spec/example-225.md
diff --git a/tests/markdown_spec/example-226.md b/tests/markdown/spec/example-226.md
similarity index 100%
rename from tests/markdown_spec/example-226.md
rename to tests/markdown/spec/example-226.md
diff --git a/tests/markdown_spec/example-227.md b/tests/markdown/spec/example-227.md
similarity index 100%
rename from tests/markdown_spec/example-227.md
rename to tests/markdown/spec/example-227.md
diff --git a/tests/markdown_spec/example-228.md b/tests/markdown/spec/example-228.md
similarity index 100%
rename from tests/markdown_spec/example-228.md
rename to tests/markdown/spec/example-228.md
diff --git a/tests/markdown_spec/example-229.md b/tests/markdown/spec/example-229.md
similarity index 100%
rename from tests/markdown_spec/example-229.md
rename to tests/markdown/spec/example-229.md
diff --git a/tests/markdown_spec/example-23.md b/tests/markdown/spec/example-23.md
similarity index 100%
rename from tests/markdown_spec/example-23.md
rename to tests/markdown/spec/example-23.md
diff --git a/tests/markdown_spec/example-230.md b/tests/markdown/spec/example-230.md
similarity index 100%
rename from tests/markdown_spec/example-230.md
rename to tests/markdown/spec/example-230.md
diff --git a/tests/markdown_spec/example-231.md b/tests/markdown/spec/example-231.md
similarity index 100%
rename from tests/markdown_spec/example-231.md
rename to tests/markdown/spec/example-231.md
diff --git a/tests/markdown_spec/example-232.md b/tests/markdown/spec/example-232.md
similarity index 100%
rename from tests/markdown_spec/example-232.md
rename to tests/markdown/spec/example-232.md
diff --git a/tests/markdown_spec/example-233.md b/tests/markdown/spec/example-233.md
similarity index 100%
rename from tests/markdown_spec/example-233.md
rename to tests/markdown/spec/example-233.md
diff --git a/tests/markdown_spec/example-234.md b/tests/markdown/spec/example-234.md
similarity index 100%
rename from tests/markdown_spec/example-234.md
rename to tests/markdown/spec/example-234.md
diff --git a/tests/markdown_spec/example-235.md b/tests/markdown/spec/example-235.md
similarity index 100%
rename from tests/markdown_spec/example-235.md
rename to tests/markdown/spec/example-235.md
diff --git a/tests/markdown_spec/example-236.md b/tests/markdown/spec/example-236.md
similarity index 100%
rename from tests/markdown_spec/example-236.md
rename to tests/markdown/spec/example-236.md
diff --git a/tests/markdown_spec/example-237.md b/tests/markdown/spec/example-237.md
similarity index 100%
rename from tests/markdown_spec/example-237.md
rename to tests/markdown/spec/example-237.md
diff --git a/tests/markdown_spec/example-238.md b/tests/markdown/spec/example-238.md
similarity index 100%
rename from tests/markdown_spec/example-238.md
rename to tests/markdown/spec/example-238.md
diff --git a/tests/markdown_spec/example-240.md b/tests/markdown/spec/example-240.md
similarity index 100%
rename from tests/markdown_spec/example-240.md
rename to tests/markdown/spec/example-240.md
diff --git a/tests/markdown_spec/example-241.md b/tests/markdown/spec/example-241.md
similarity index 100%
rename from tests/markdown_spec/example-241.md
rename to tests/markdown/spec/example-241.md
diff --git a/tests/markdown_spec/example-242.md b/tests/markdown/spec/example-242.md
similarity index 100%
rename from tests/markdown_spec/example-242.md
rename to tests/markdown/spec/example-242.md
diff --git a/tests/markdown_spec/example-243.md b/tests/markdown/spec/example-243.md
similarity index 100%
rename from tests/markdown_spec/example-243.md
rename to tests/markdown/spec/example-243.md
diff --git a/tests/markdown_spec/example-244.md b/tests/markdown/spec/example-244.md
similarity index 100%
rename from tests/markdown_spec/example-244.md
rename to tests/markdown/spec/example-244.md
diff --git a/tests/markdown_spec/example-245.md b/tests/markdown/spec/example-245.md
similarity index 100%
rename from tests/markdown_spec/example-245.md
rename to tests/markdown/spec/example-245.md
diff --git a/tests/markdown_spec/example-246.md b/tests/markdown/spec/example-246.md
similarity index 100%
rename from tests/markdown_spec/example-246.md
rename to tests/markdown/spec/example-246.md
diff --git a/tests/markdown_spec/example-247.md b/tests/markdown/spec/example-247.md
similarity index 100%
rename from tests/markdown_spec/example-247.md
rename to tests/markdown/spec/example-247.md
diff --git a/tests/markdown_spec/example-248.md b/tests/markdown/spec/example-248.md
similarity index 100%
rename from tests/markdown_spec/example-248.md
rename to tests/markdown/spec/example-248.md
diff --git a/tests/markdown_spec/example-249.md b/tests/markdown/spec/example-249.md
similarity index 100%
rename from tests/markdown_spec/example-249.md
rename to tests/markdown/spec/example-249.md
diff --git a/tests/markdown_spec/example-25.md b/tests/markdown/spec/example-25.md
similarity index 100%
rename from tests/markdown_spec/example-25.md
rename to tests/markdown/spec/example-25.md
diff --git a/tests/markdown_spec/example-250.md b/tests/markdown/spec/example-250.md
similarity index 100%
rename from tests/markdown_spec/example-250.md
rename to tests/markdown/spec/example-250.md
diff --git a/tests/markdown_spec/example-251.md b/tests/markdown/spec/example-251.md
similarity index 100%
rename from tests/markdown_spec/example-251.md
rename to tests/markdown/spec/example-251.md
diff --git a/tests/markdown_spec/example-252.md b/tests/markdown/spec/example-252.md
similarity index 100%
rename from tests/markdown_spec/example-252.md
rename to tests/markdown/spec/example-252.md
diff --git a/tests/markdown_spec/example-253.md b/tests/markdown/spec/example-253.md
similarity index 100%
rename from tests/markdown_spec/example-253.md
rename to tests/markdown/spec/example-253.md
diff --git a/tests/markdown_spec/example-254.md b/tests/markdown/spec/example-254.md
similarity index 100%
rename from tests/markdown_spec/example-254.md
rename to tests/markdown/spec/example-254.md
diff --git a/tests/markdown_spec/example-255.md b/tests/markdown/spec/example-255.md
similarity index 100%
rename from tests/markdown_spec/example-255.md
rename to tests/markdown/spec/example-255.md
diff --git a/tests/markdown_spec/example-256.md b/tests/markdown/spec/example-256.md
similarity index 100%
rename from tests/markdown_spec/example-256.md
rename to tests/markdown/spec/example-256.md
diff --git a/tests/markdown_spec/example-257.md b/tests/markdown/spec/example-257.md
similarity index 100%
rename from tests/markdown_spec/example-257.md
rename to tests/markdown/spec/example-257.md
diff --git a/tests/markdown_spec/example-258.md b/tests/markdown/spec/example-258.md
similarity index 100%
rename from tests/markdown_spec/example-258.md
rename to tests/markdown/spec/example-258.md
diff --git a/tests/markdown_spec/example-259.md b/tests/markdown/spec/example-259.md
similarity index 100%
rename from tests/markdown_spec/example-259.md
rename to tests/markdown/spec/example-259.md
diff --git a/tests/markdown_spec/example-26.md b/tests/markdown/spec/example-26.md
similarity index 100%
rename from tests/markdown_spec/example-26.md
rename to tests/markdown/spec/example-26.md
diff --git a/tests/markdown_spec/example-260.md b/tests/markdown/spec/example-260.md
similarity index 100%
rename from tests/markdown_spec/example-260.md
rename to tests/markdown/spec/example-260.md
diff --git a/tests/markdown_spec/example-261.md b/tests/markdown/spec/example-261.md
similarity index 100%
rename from tests/markdown_spec/example-261.md
rename to tests/markdown/spec/example-261.md
diff --git a/tests/markdown_spec/example-262.md b/tests/markdown/spec/example-262.md
similarity index 100%
rename from tests/markdown_spec/example-262.md
rename to tests/markdown/spec/example-262.md
diff --git a/tests/markdown_spec/example-263.md b/tests/markdown/spec/example-263.md
similarity index 100%
rename from tests/markdown_spec/example-263.md
rename to tests/markdown/spec/example-263.md
diff --git a/tests/markdown_spec/example-264.md b/tests/markdown/spec/example-264.md
similarity index 100%
rename from tests/markdown_spec/example-264.md
rename to tests/markdown/spec/example-264.md
diff --git a/tests/markdown_spec/example-265.md b/tests/markdown/spec/example-265.md
similarity index 100%
rename from tests/markdown_spec/example-265.md
rename to tests/markdown/spec/example-265.md
diff --git a/tests/markdown_spec/example-266.md b/tests/markdown/spec/example-266.md
similarity index 100%
rename from tests/markdown_spec/example-266.md
rename to tests/markdown/spec/example-266.md
diff --git a/tests/markdown_spec/example-267.md b/tests/markdown/spec/example-267.md
similarity index 100%
rename from tests/markdown_spec/example-267.md
rename to tests/markdown/spec/example-267.md
diff --git a/tests/markdown_spec/example-268.md b/tests/markdown/spec/example-268.md
similarity index 100%
rename from tests/markdown_spec/example-268.md
rename to tests/markdown/spec/example-268.md
diff --git a/tests/markdown_spec/example-269.md b/tests/markdown/spec/example-269.md
similarity index 100%
rename from tests/markdown_spec/example-269.md
rename to tests/markdown/spec/example-269.md
diff --git a/tests/markdown_spec/example-27.md b/tests/markdown/spec/example-27.md
similarity index 100%
rename from tests/markdown_spec/example-27.md
rename to tests/markdown/spec/example-27.md
diff --git a/tests/markdown_spec/example-271.md b/tests/markdown/spec/example-271.md
similarity index 100%
rename from tests/markdown_spec/example-271.md
rename to tests/markdown/spec/example-271.md
diff --git a/tests/markdown_spec/example-272.md b/tests/markdown/spec/example-272.md
similarity index 100%
rename from tests/markdown_spec/example-272.md
rename to tests/markdown/spec/example-272.md
diff --git a/tests/markdown_spec/example-273.md b/tests/markdown/spec/example-273.md
similarity index 100%
rename from tests/markdown_spec/example-273.md
rename to tests/markdown/spec/example-273.md
diff --git a/tests/markdown_spec/example-274.md b/tests/markdown/spec/example-274.md
similarity index 100%
rename from tests/markdown_spec/example-274.md
rename to tests/markdown/spec/example-274.md
diff --git a/tests/markdown_spec/example-276.md b/tests/markdown/spec/example-276.md
similarity index 100%
rename from tests/markdown_spec/example-276.md
rename to tests/markdown/spec/example-276.md
diff --git a/tests/markdown_spec/example-277.md b/tests/markdown/spec/example-277.md
similarity index 100%
rename from tests/markdown_spec/example-277.md
rename to tests/markdown/spec/example-277.md
diff --git a/tests/markdown_spec/example-278.md b/tests/markdown/spec/example-278.md
similarity index 100%
rename from tests/markdown_spec/example-278.md
rename to tests/markdown/spec/example-278.md
diff --git a/tests/markdown_spec/example-279.md b/tests/markdown/spec/example-279.md
similarity index 100%
rename from tests/markdown_spec/example-279.md
rename to tests/markdown/spec/example-279.md
diff --git a/tests/markdown_spec/example-28.md b/tests/markdown/spec/example-28.md
similarity index 100%
rename from tests/markdown_spec/example-28.md
rename to tests/markdown/spec/example-28.md
diff --git a/tests/markdown_spec/example-280.md b/tests/markdown/spec/example-280.md
similarity index 100%
rename from tests/markdown_spec/example-280.md
rename to tests/markdown/spec/example-280.md
diff --git a/tests/markdown_spec/example-281.md b/tests/markdown/spec/example-281.md
similarity index 100%
rename from tests/markdown_spec/example-281.md
rename to tests/markdown/spec/example-281.md
diff --git a/tests/markdown_spec/example-282.md b/tests/markdown/spec/example-282.md
similarity index 100%
rename from tests/markdown_spec/example-282.md
rename to tests/markdown/spec/example-282.md
diff --git a/tests/markdown_spec/example-283.md b/tests/markdown/spec/example-283.md
similarity index 100%
rename from tests/markdown_spec/example-283.md
rename to tests/markdown/spec/example-283.md
diff --git a/tests/markdown_spec/example-284.md b/tests/markdown/spec/example-284.md
similarity index 100%
rename from tests/markdown_spec/example-284.md
rename to tests/markdown/spec/example-284.md
diff --git a/tests/markdown_spec/example-285.md b/tests/markdown/spec/example-285.md
similarity index 100%
rename from tests/markdown_spec/example-285.md
rename to tests/markdown/spec/example-285.md
diff --git a/tests/markdown_spec/example-286.md b/tests/markdown/spec/example-286.md
similarity index 100%
rename from tests/markdown_spec/example-286.md
rename to tests/markdown/spec/example-286.md
diff --git a/tests/markdown_spec/example-287.md b/tests/markdown/spec/example-287.md
similarity index 100%
rename from tests/markdown_spec/example-287.md
rename to tests/markdown/spec/example-287.md
diff --git a/tests/markdown_spec/example-288.md b/tests/markdown/spec/example-288.md
similarity index 100%
rename from tests/markdown_spec/example-288.md
rename to tests/markdown/spec/example-288.md
diff --git a/tests/markdown_spec/example-289.md b/tests/markdown/spec/example-289.md
similarity index 100%
rename from tests/markdown_spec/example-289.md
rename to tests/markdown/spec/example-289.md
diff --git a/tests/markdown_spec/example-29.md b/tests/markdown/spec/example-29.md
similarity index 100%
rename from tests/markdown_spec/example-29.md
rename to tests/markdown/spec/example-29.md
diff --git a/tests/markdown_spec/example-290.md b/tests/markdown/spec/example-290.md
similarity index 100%
rename from tests/markdown_spec/example-290.md
rename to tests/markdown/spec/example-290.md
diff --git a/tests/markdown_spec/example-291.md b/tests/markdown/spec/example-291.md
similarity index 100%
rename from tests/markdown_spec/example-291.md
rename to tests/markdown/spec/example-291.md
diff --git a/tests/markdown_spec/example-292.md b/tests/markdown/spec/example-292.md
similarity index 100%
rename from tests/markdown_spec/example-292.md
rename to tests/markdown/spec/example-292.md
diff --git a/tests/markdown_spec/example-293.md b/tests/markdown/spec/example-293.md
similarity index 100%
rename from tests/markdown_spec/example-293.md
rename to tests/markdown/spec/example-293.md
diff --git a/tests/markdown_spec/example-294.md b/tests/markdown/spec/example-294.md
similarity index 100%
rename from tests/markdown_spec/example-294.md
rename to tests/markdown/spec/example-294.md
diff --git a/tests/markdown_spec/example-295.md b/tests/markdown/spec/example-295.md
similarity index 100%
rename from tests/markdown_spec/example-295.md
rename to tests/markdown/spec/example-295.md
diff --git a/tests/markdown_spec/example-296.md b/tests/markdown/spec/example-296.md
similarity index 100%
rename from tests/markdown_spec/example-296.md
rename to tests/markdown/spec/example-296.md
diff --git a/tests/markdown_spec/example-297.md b/tests/markdown/spec/example-297.md
similarity index 100%
rename from tests/markdown_spec/example-297.md
rename to tests/markdown/spec/example-297.md
diff --git a/tests/markdown_spec/example-298.md b/tests/markdown/spec/example-298.md
similarity index 100%
rename from tests/markdown_spec/example-298.md
rename to tests/markdown/spec/example-298.md
diff --git a/tests/markdown_spec/example-299.md b/tests/markdown/spec/example-299.md
similarity index 100%
rename from tests/markdown_spec/example-299.md
rename to tests/markdown/spec/example-299.md
diff --git a/tests/markdown_spec/example-3.md b/tests/markdown/spec/example-3.md
similarity index 100%
rename from tests/markdown_spec/example-3.md
rename to tests/markdown/spec/example-3.md
diff --git a/tests/markdown_spec/example-30.md b/tests/markdown/spec/example-30.md
similarity index 100%
rename from tests/markdown_spec/example-30.md
rename to tests/markdown/spec/example-30.md
diff --git a/tests/markdown_spec/example-300.md b/tests/markdown/spec/example-300.md
similarity index 100%
rename from tests/markdown_spec/example-300.md
rename to tests/markdown/spec/example-300.md
diff --git a/tests/markdown_spec/example-301.md b/tests/markdown/spec/example-301.md
similarity index 100%
rename from tests/markdown_spec/example-301.md
rename to tests/markdown/spec/example-301.md
diff --git a/tests/markdown_spec/example-302.md b/tests/markdown/spec/example-302.md
similarity index 100%
rename from tests/markdown_spec/example-302.md
rename to tests/markdown/spec/example-302.md
diff --git a/tests/markdown_spec/example-303.md b/tests/markdown/spec/example-303.md
similarity index 100%
rename from tests/markdown_spec/example-303.md
rename to tests/markdown/spec/example-303.md
diff --git a/tests/markdown_spec/example-304.md b/tests/markdown/spec/example-304.md
similarity index 100%
rename from tests/markdown_spec/example-304.md
rename to tests/markdown/spec/example-304.md
diff --git a/tests/markdown_spec/example-305.md b/tests/markdown/spec/example-305.md
similarity index 100%
rename from tests/markdown_spec/example-305.md
rename to tests/markdown/spec/example-305.md
diff --git a/tests/markdown_spec/example-306.md b/tests/markdown/spec/example-306.md
similarity index 100%
rename from tests/markdown_spec/example-306.md
rename to tests/markdown/spec/example-306.md
diff --git a/tests/markdown_spec/example-307.md b/tests/markdown/spec/example-307.md
similarity index 100%
rename from tests/markdown_spec/example-307.md
rename to tests/markdown/spec/example-307.md
diff --git a/tests/markdown_spec/example-308.md b/tests/markdown/spec/example-308.md
similarity index 100%
rename from tests/markdown_spec/example-308.md
rename to tests/markdown/spec/example-308.md
diff --git a/tests/markdown_spec/example-309.md b/tests/markdown/spec/example-309.md
similarity index 100%
rename from tests/markdown_spec/example-309.md
rename to tests/markdown/spec/example-309.md
diff --git a/tests/markdown_spec/example-31.md b/tests/markdown/spec/example-31.md
similarity index 100%
rename from tests/markdown_spec/example-31.md
rename to tests/markdown/spec/example-31.md
diff --git a/tests/markdown_spec/example-310.md b/tests/markdown/spec/example-310.md
similarity index 100%
rename from tests/markdown_spec/example-310.md
rename to tests/markdown/spec/example-310.md
diff --git a/tests/markdown_spec/example-311.md b/tests/markdown/spec/example-311.md
similarity index 100%
rename from tests/markdown_spec/example-311.md
rename to tests/markdown/spec/example-311.md
diff --git a/tests/markdown_spec/example-312.md b/tests/markdown/spec/example-312.md
similarity index 100%
rename from tests/markdown_spec/example-312.md
rename to tests/markdown/spec/example-312.md
diff --git a/tests/markdown_spec/example-313.md b/tests/markdown/spec/example-313.md
similarity index 100%
rename from tests/markdown_spec/example-313.md
rename to tests/markdown/spec/example-313.md
diff --git a/tests/markdown_spec/example-314.md b/tests/markdown/spec/example-314.md
similarity index 100%
rename from tests/markdown_spec/example-314.md
rename to tests/markdown/spec/example-314.md
diff --git a/tests/markdown_spec/example-315.md b/tests/markdown/spec/example-315.md
similarity index 100%
rename from tests/markdown_spec/example-315.md
rename to tests/markdown/spec/example-315.md
diff --git a/tests/markdown_spec/example-316.md b/tests/markdown/spec/example-316.md
similarity index 100%
rename from tests/markdown_spec/example-316.md
rename to tests/markdown/spec/example-316.md
diff --git a/tests/markdown_spec/example-317.md b/tests/markdown/spec/example-317.md
similarity index 100%
rename from tests/markdown_spec/example-317.md
rename to tests/markdown/spec/example-317.md
diff --git a/tests/markdown_spec/example-318.md b/tests/markdown/spec/example-318.md
similarity index 100%
rename from tests/markdown_spec/example-318.md
rename to tests/markdown/spec/example-318.md
diff --git a/tests/markdown_spec/example-319.md b/tests/markdown/spec/example-319.md
similarity index 100%
rename from tests/markdown_spec/example-319.md
rename to tests/markdown/spec/example-319.md
diff --git a/tests/markdown_spec/example-32.md b/tests/markdown/spec/example-32.md
similarity index 100%
rename from tests/markdown_spec/example-32.md
rename to tests/markdown/spec/example-32.md
diff --git a/tests/markdown_spec/example-320.md b/tests/markdown/spec/example-320.md
similarity index 100%
rename from tests/markdown_spec/example-320.md
rename to tests/markdown/spec/example-320.md
diff --git a/tests/markdown_spec/example-321.md b/tests/markdown/spec/example-321.md
similarity index 100%
rename from tests/markdown_spec/example-321.md
rename to tests/markdown/spec/example-321.md
diff --git a/tests/markdown_spec/example-322.md b/tests/markdown/spec/example-322.md
similarity index 100%
rename from tests/markdown_spec/example-322.md
rename to tests/markdown/spec/example-322.md
diff --git a/tests/markdown_spec/example-324.md b/tests/markdown/spec/example-324.md
similarity index 100%
rename from tests/markdown_spec/example-324.md
rename to tests/markdown/spec/example-324.md
diff --git a/tests/markdown_spec/example-325.md b/tests/markdown/spec/example-325.md
similarity index 100%
rename from tests/markdown_spec/example-325.md
rename to tests/markdown/spec/example-325.md
diff --git a/tests/markdown_spec/example-326.md b/tests/markdown/spec/example-326.md
similarity index 100%
rename from tests/markdown_spec/example-326.md
rename to tests/markdown/spec/example-326.md
diff --git a/tests/markdown_spec/example-327.md b/tests/markdown/spec/example-327.md
similarity index 100%
rename from tests/markdown_spec/example-327.md
rename to tests/markdown/spec/example-327.md
diff --git a/tests/markdown_spec/example-328.md b/tests/markdown/spec/example-328.md
similarity index 100%
rename from tests/markdown_spec/example-328.md
rename to tests/markdown/spec/example-328.md
diff --git a/tests/markdown_spec/example-329.md b/tests/markdown/spec/example-329.md
similarity index 100%
rename from tests/markdown_spec/example-329.md
rename to tests/markdown/spec/example-329.md
diff --git a/tests/markdown_spec/example-33.md b/tests/markdown/spec/example-33.md
similarity index 100%
rename from tests/markdown_spec/example-33.md
rename to tests/markdown/spec/example-33.md
diff --git a/tests/markdown_spec/example-330.md b/tests/markdown/spec/example-330.md
similarity index 100%
rename from tests/markdown_spec/example-330.md
rename to tests/markdown/spec/example-330.md
diff --git a/tests/markdown_spec/example-331.md b/tests/markdown/spec/example-331.md
similarity index 100%
rename from tests/markdown_spec/example-331.md
rename to tests/markdown/spec/example-331.md
diff --git a/tests/markdown_spec/example-332.md b/tests/markdown/spec/example-332.md
similarity index 100%
rename from tests/markdown_spec/example-332.md
rename to tests/markdown/spec/example-332.md
diff --git a/tests/markdown_spec/example-333.md b/tests/markdown/spec/example-333.md
similarity index 100%
rename from tests/markdown_spec/example-333.md
rename to tests/markdown/spec/example-333.md
diff --git a/tests/markdown_spec/example-334.md b/tests/markdown/spec/example-334.md
similarity index 100%
rename from tests/markdown_spec/example-334.md
rename to tests/markdown/spec/example-334.md
diff --git a/tests/markdown_spec/example-335.md b/tests/markdown/spec/example-335.md
similarity index 100%
rename from tests/markdown_spec/example-335.md
rename to tests/markdown/spec/example-335.md
diff --git a/tests/markdown_spec/example-336.md b/tests/markdown/spec/example-336.md
similarity index 100%
rename from tests/markdown_spec/example-336.md
rename to tests/markdown/spec/example-336.md
diff --git a/tests/markdown_spec/example-337.md b/tests/markdown/spec/example-337.md
similarity index 100%
rename from tests/markdown_spec/example-337.md
rename to tests/markdown/spec/example-337.md
diff --git a/tests/markdown_spec/example-338.md b/tests/markdown/spec/example-338.md
similarity index 100%
rename from tests/markdown_spec/example-338.md
rename to tests/markdown/spec/example-338.md
diff --git a/tests/markdown_spec/example-339.md b/tests/markdown/spec/example-339.md
similarity index 100%
rename from tests/markdown_spec/example-339.md
rename to tests/markdown/spec/example-339.md
diff --git a/tests/markdown_spec/example-34.md b/tests/markdown/spec/example-34.md
similarity index 100%
rename from tests/markdown_spec/example-34.md
rename to tests/markdown/spec/example-34.md
diff --git a/tests/markdown_spec/example-340.md b/tests/markdown/spec/example-340.md
similarity index 100%
rename from tests/markdown_spec/example-340.md
rename to tests/markdown/spec/example-340.md
diff --git a/tests/markdown_spec/example-341.md b/tests/markdown/spec/example-341.md
similarity index 100%
rename from tests/markdown_spec/example-341.md
rename to tests/markdown/spec/example-341.md
diff --git a/tests/markdown_spec/example-342.md b/tests/markdown/spec/example-342.md
similarity index 100%
rename from tests/markdown_spec/example-342.md
rename to tests/markdown/spec/example-342.md
diff --git a/tests/markdown_spec/example-343.md b/tests/markdown/spec/example-343.md
similarity index 100%
rename from tests/markdown_spec/example-343.md
rename to tests/markdown/spec/example-343.md
diff --git a/tests/markdown_spec/example-344.md b/tests/markdown/spec/example-344.md
similarity index 100%
rename from tests/markdown_spec/example-344.md
rename to tests/markdown/spec/example-344.md
diff --git a/tests/markdown_spec/example-345.md b/tests/markdown/spec/example-345.md
similarity index 100%
rename from tests/markdown_spec/example-345.md
rename to tests/markdown/spec/example-345.md
diff --git a/tests/markdown_spec/example-346.md b/tests/markdown/spec/example-346.md
similarity index 100%
rename from tests/markdown_spec/example-346.md
rename to tests/markdown/spec/example-346.md
diff --git a/tests/markdown_spec/example-347.md b/tests/markdown/spec/example-347.md
similarity index 100%
rename from tests/markdown_spec/example-347.md
rename to tests/markdown/spec/example-347.md
diff --git a/tests/markdown_spec/example-348.md b/tests/markdown/spec/example-348.md
similarity index 100%
rename from tests/markdown_spec/example-348.md
rename to tests/markdown/spec/example-348.md
diff --git a/tests/markdown_spec/example-349.md b/tests/markdown/spec/example-349.md
similarity index 100%
rename from tests/markdown_spec/example-349.md
rename to tests/markdown/spec/example-349.md
diff --git a/tests/markdown_spec/example-35.md b/tests/markdown/spec/example-35.md
similarity index 100%
rename from tests/markdown_spec/example-35.md
rename to tests/markdown/spec/example-35.md
diff --git a/tests/markdown_spec/example-350.md b/tests/markdown/spec/example-350.md
similarity index 100%
rename from tests/markdown_spec/example-350.md
rename to tests/markdown/spec/example-350.md
diff --git a/tests/markdown_spec/example-351.md b/tests/markdown/spec/example-351.md
similarity index 100%
rename from tests/markdown_spec/example-351.md
rename to tests/markdown/spec/example-351.md
diff --git a/tests/markdown_spec/example-352.md b/tests/markdown/spec/example-352.md
similarity index 100%
rename from tests/markdown_spec/example-352.md
rename to tests/markdown/spec/example-352.md
diff --git a/tests/markdown_spec/example-353.md b/tests/markdown/spec/example-353.md
similarity index 100%
rename from tests/markdown_spec/example-353.md
rename to tests/markdown/spec/example-353.md
diff --git a/tests/markdown_spec/example-354.md b/tests/markdown/spec/example-354.md
similarity index 100%
rename from tests/markdown_spec/example-354.md
rename to tests/markdown/spec/example-354.md
diff --git a/tests/markdown_spec/example-355.md b/tests/markdown/spec/example-355.md
similarity index 100%
rename from tests/markdown_spec/example-355.md
rename to tests/markdown/spec/example-355.md
diff --git a/tests/markdown_spec/example-356.md b/tests/markdown/spec/example-356.md
similarity index 100%
rename from tests/markdown_spec/example-356.md
rename to tests/markdown/spec/example-356.md
diff --git a/tests/markdown_spec/example-357.md b/tests/markdown/spec/example-357.md
similarity index 100%
rename from tests/markdown_spec/example-357.md
rename to tests/markdown/spec/example-357.md
diff --git a/tests/markdown_spec/example-358.md b/tests/markdown/spec/example-358.md
similarity index 100%
rename from tests/markdown_spec/example-358.md
rename to tests/markdown/spec/example-358.md
diff --git a/tests/markdown_spec/example-359.md b/tests/markdown/spec/example-359.md
similarity index 100%
rename from tests/markdown_spec/example-359.md
rename to tests/markdown/spec/example-359.md
diff --git a/tests/markdown_spec/example-36.md b/tests/markdown/spec/example-36.md
similarity index 100%
rename from tests/markdown_spec/example-36.md
rename to tests/markdown/spec/example-36.md
diff --git a/tests/markdown_spec/example-360.md b/tests/markdown/spec/example-360.md
similarity index 100%
rename from tests/markdown_spec/example-360.md
rename to tests/markdown/spec/example-360.md
diff --git a/tests/markdown_spec/example-361.md b/tests/markdown/spec/example-361.md
similarity index 100%
rename from tests/markdown_spec/example-361.md
rename to tests/markdown/spec/example-361.md
diff --git a/tests/markdown_spec/example-362.md b/tests/markdown/spec/example-362.md
similarity index 100%
rename from tests/markdown_spec/example-362.md
rename to tests/markdown/spec/example-362.md
diff --git a/tests/markdown_spec/example-363.md b/tests/markdown/spec/example-363.md
similarity index 100%
rename from tests/markdown_spec/example-363.md
rename to tests/markdown/spec/example-363.md
diff --git a/tests/markdown_spec/example-364.md b/tests/markdown/spec/example-364.md
similarity index 100%
rename from tests/markdown_spec/example-364.md
rename to tests/markdown/spec/example-364.md
diff --git a/tests/markdown_spec/example-365.md b/tests/markdown/spec/example-365.md
similarity index 100%
rename from tests/markdown_spec/example-365.md
rename to tests/markdown/spec/example-365.md
diff --git a/tests/markdown_spec/example-366.md b/tests/markdown/spec/example-366.md
similarity index 100%
rename from tests/markdown_spec/example-366.md
rename to tests/markdown/spec/example-366.md
diff --git a/tests/markdown_spec/example-367.md b/tests/markdown/spec/example-367.md
similarity index 100%
rename from tests/markdown_spec/example-367.md
rename to tests/markdown/spec/example-367.md
diff --git a/tests/markdown_spec/example-368.md b/tests/markdown/spec/example-368.md
similarity index 100%
rename from tests/markdown_spec/example-368.md
rename to tests/markdown/spec/example-368.md
diff --git a/tests/markdown_spec/example-369.md b/tests/markdown/spec/example-369.md
similarity index 100%
rename from tests/markdown_spec/example-369.md
rename to tests/markdown/spec/example-369.md
diff --git a/tests/markdown_spec/example-37.md b/tests/markdown/spec/example-37.md
similarity index 100%
rename from tests/markdown_spec/example-37.md
rename to tests/markdown/spec/example-37.md
diff --git a/tests/markdown_spec/example-370.md b/tests/markdown/spec/example-370.md
similarity index 100%
rename from tests/markdown_spec/example-370.md
rename to tests/markdown/spec/example-370.md
diff --git a/tests/markdown_spec/example-371.md b/tests/markdown/spec/example-371.md
similarity index 100%
rename from tests/markdown_spec/example-371.md
rename to tests/markdown/spec/example-371.md
diff --git a/tests/markdown_spec/example-372.md b/tests/markdown/spec/example-372.md
similarity index 100%
rename from tests/markdown_spec/example-372.md
rename to tests/markdown/spec/example-372.md
diff --git a/tests/markdown_spec/example-373.md b/tests/markdown/spec/example-373.md
similarity index 100%
rename from tests/markdown_spec/example-373.md
rename to tests/markdown/spec/example-373.md
diff --git a/tests/markdown_spec/example-374.md b/tests/markdown/spec/example-374.md
similarity index 100%
rename from tests/markdown_spec/example-374.md
rename to tests/markdown/spec/example-374.md
diff --git a/tests/markdown_spec/example-375.md b/tests/markdown/spec/example-375.md
similarity index 100%
rename from tests/markdown_spec/example-375.md
rename to tests/markdown/spec/example-375.md
diff --git a/tests/markdown_spec/example-376.md b/tests/markdown/spec/example-376.md
similarity index 100%
rename from tests/markdown_spec/example-376.md
rename to tests/markdown/spec/example-376.md
diff --git a/tests/markdown_spec/example-377.md b/tests/markdown/spec/example-377.md
similarity index 100%
rename from tests/markdown_spec/example-377.md
rename to tests/markdown/spec/example-377.md
diff --git a/tests/markdown_spec/example-378.md b/tests/markdown/spec/example-378.md
similarity index 100%
rename from tests/markdown_spec/example-378.md
rename to tests/markdown/spec/example-378.md
diff --git a/tests/markdown_spec/example-379.md b/tests/markdown/spec/example-379.md
similarity index 100%
rename from tests/markdown_spec/example-379.md
rename to tests/markdown/spec/example-379.md
diff --git a/tests/markdown_spec/example-38.md b/tests/markdown/spec/example-38.md
similarity index 100%
rename from tests/markdown_spec/example-38.md
rename to tests/markdown/spec/example-38.md
diff --git a/tests/markdown_spec/example-380.md b/tests/markdown/spec/example-380.md
similarity index 100%
rename from tests/markdown_spec/example-380.md
rename to tests/markdown/spec/example-380.md
diff --git a/tests/markdown_spec/example-381.md b/tests/markdown/spec/example-381.md
similarity index 100%
rename from tests/markdown_spec/example-381.md
rename to tests/markdown/spec/example-381.md
diff --git a/tests/markdown_spec/example-382.md b/tests/markdown/spec/example-382.md
similarity index 100%
rename from tests/markdown_spec/example-382.md
rename to tests/markdown/spec/example-382.md
diff --git a/tests/markdown_spec/example-383.md b/tests/markdown/spec/example-383.md
similarity index 100%
rename from tests/markdown_spec/example-383.md
rename to tests/markdown/spec/example-383.md
diff --git a/tests/markdown_spec/example-384.md b/tests/markdown/spec/example-384.md
similarity index 100%
rename from tests/markdown_spec/example-384.md
rename to tests/markdown/spec/example-384.md
diff --git a/tests/markdown_spec/example-385.md b/tests/markdown/spec/example-385.md
similarity index 100%
rename from tests/markdown_spec/example-385.md
rename to tests/markdown/spec/example-385.md
diff --git a/tests/markdown_spec/example-386.md b/tests/markdown/spec/example-386.md
similarity index 100%
rename from tests/markdown_spec/example-386.md
rename to tests/markdown/spec/example-386.md
diff --git a/tests/markdown_spec/example-387.md b/tests/markdown/spec/example-387.md
similarity index 100%
rename from tests/markdown_spec/example-387.md
rename to tests/markdown/spec/example-387.md
diff --git a/tests/markdown_spec/example-388.md b/tests/markdown/spec/example-388.md
similarity index 100%
rename from tests/markdown_spec/example-388.md
rename to tests/markdown/spec/example-388.md
diff --git a/tests/markdown_spec/example-39.md b/tests/markdown/spec/example-39.md
similarity index 100%
rename from tests/markdown_spec/example-39.md
rename to tests/markdown/spec/example-39.md
diff --git a/tests/markdown_spec/example-390.md b/tests/markdown/spec/example-390.md
similarity index 100%
rename from tests/markdown_spec/example-390.md
rename to tests/markdown/spec/example-390.md
diff --git a/tests/markdown_spec/example-391.md b/tests/markdown/spec/example-391.md
similarity index 100%
rename from tests/markdown_spec/example-391.md
rename to tests/markdown/spec/example-391.md
diff --git a/tests/markdown_spec/example-392.md b/tests/markdown/spec/example-392.md
similarity index 100%
rename from tests/markdown_spec/example-392.md
rename to tests/markdown/spec/example-392.md
diff --git a/tests/markdown_spec/example-393.md b/tests/markdown/spec/example-393.md
similarity index 100%
rename from tests/markdown_spec/example-393.md
rename to tests/markdown/spec/example-393.md
diff --git a/tests/markdown_spec/example-394.md b/tests/markdown/spec/example-394.md
similarity index 100%
rename from tests/markdown_spec/example-394.md
rename to tests/markdown/spec/example-394.md
diff --git a/tests/markdown_spec/example-395.md b/tests/markdown/spec/example-395.md
similarity index 100%
rename from tests/markdown_spec/example-395.md
rename to tests/markdown/spec/example-395.md
diff --git a/tests/markdown_spec/example-396.md b/tests/markdown/spec/example-396.md
similarity index 100%
rename from tests/markdown_spec/example-396.md
rename to tests/markdown/spec/example-396.md
diff --git a/tests/markdown_spec/example-397.md b/tests/markdown/spec/example-397.md
similarity index 100%
rename from tests/markdown_spec/example-397.md
rename to tests/markdown/spec/example-397.md
diff --git a/tests/markdown_spec/example-398.md b/tests/markdown/spec/example-398.md
similarity index 100%
rename from tests/markdown_spec/example-398.md
rename to tests/markdown/spec/example-398.md
diff --git a/tests/markdown_spec/example-399.md b/tests/markdown/spec/example-399.md
similarity index 100%
rename from tests/markdown_spec/example-399.md
rename to tests/markdown/spec/example-399.md
diff --git a/tests/markdown_spec/example-4.md b/tests/markdown/spec/example-4.md
similarity index 100%
rename from tests/markdown_spec/example-4.md
rename to tests/markdown/spec/example-4.md
diff --git a/tests/markdown_spec/example-40.md b/tests/markdown/spec/example-40.md
similarity index 100%
rename from tests/markdown_spec/example-40.md
rename to tests/markdown/spec/example-40.md
diff --git a/tests/markdown_spec/example-400.md b/tests/markdown/spec/example-400.md
similarity index 100%
rename from tests/markdown_spec/example-400.md
rename to tests/markdown/spec/example-400.md
diff --git a/tests/markdown_spec/example-401.md b/tests/markdown/spec/example-401.md
similarity index 100%
rename from tests/markdown_spec/example-401.md
rename to tests/markdown/spec/example-401.md
diff --git a/tests/markdown_spec/example-402.md b/tests/markdown/spec/example-402.md
similarity index 100%
rename from tests/markdown_spec/example-402.md
rename to tests/markdown/spec/example-402.md
diff --git a/tests/markdown_spec/example-403.md b/tests/markdown/spec/example-403.md
similarity index 100%
rename from tests/markdown_spec/example-403.md
rename to tests/markdown/spec/example-403.md
diff --git a/tests/markdown_spec/example-404.md b/tests/markdown/spec/example-404.md
similarity index 100%
rename from tests/markdown_spec/example-404.md
rename to tests/markdown/spec/example-404.md
diff --git a/tests/markdown_spec/example-405.md b/tests/markdown/spec/example-405.md
similarity index 100%
rename from tests/markdown_spec/example-405.md
rename to tests/markdown/spec/example-405.md
diff --git a/tests/markdown_spec/example-406.md b/tests/markdown/spec/example-406.md
similarity index 100%
rename from tests/markdown_spec/example-406.md
rename to tests/markdown/spec/example-406.md
diff --git a/tests/markdown_spec/example-407.md b/tests/markdown/spec/example-407.md
similarity index 100%
rename from tests/markdown_spec/example-407.md
rename to tests/markdown/spec/example-407.md
diff --git a/tests/markdown_spec/example-408.md b/tests/markdown/spec/example-408.md
similarity index 100%
rename from tests/markdown_spec/example-408.md
rename to tests/markdown/spec/example-408.md
diff --git a/tests/markdown_spec/example-41.md b/tests/markdown/spec/example-41.md
similarity index 100%
rename from tests/markdown_spec/example-41.md
rename to tests/markdown/spec/example-41.md
diff --git a/tests/markdown_spec/example-410.md b/tests/markdown/spec/example-410.md
similarity index 100%
rename from tests/markdown_spec/example-410.md
rename to tests/markdown/spec/example-410.md
diff --git a/tests/markdown_spec/example-411.md b/tests/markdown/spec/example-411.md
similarity index 100%
rename from tests/markdown_spec/example-411.md
rename to tests/markdown/spec/example-411.md
diff --git a/tests/markdown_spec/example-412.md b/tests/markdown/spec/example-412.md
similarity index 100%
rename from tests/markdown_spec/example-412.md
rename to tests/markdown/spec/example-412.md
diff --git a/tests/markdown_spec/example-413.md b/tests/markdown/spec/example-413.md
similarity index 100%
rename from tests/markdown_spec/example-413.md
rename to tests/markdown/spec/example-413.md
diff --git a/tests/markdown_spec/example-414.md b/tests/markdown/spec/example-414.md
similarity index 100%
rename from tests/markdown_spec/example-414.md
rename to tests/markdown/spec/example-414.md
diff --git a/tests/markdown_spec/example-415.md b/tests/markdown/spec/example-415.md
similarity index 100%
rename from tests/markdown_spec/example-415.md
rename to tests/markdown/spec/example-415.md
diff --git a/tests/markdown_spec/example-417.md b/tests/markdown/spec/example-417.md
similarity index 100%
rename from tests/markdown_spec/example-417.md
rename to tests/markdown/spec/example-417.md
diff --git a/tests/markdown_spec/example-418.md b/tests/markdown/spec/example-418.md
similarity index 100%
rename from tests/markdown_spec/example-418.md
rename to tests/markdown/spec/example-418.md
diff --git a/tests/markdown_spec/example-419.md b/tests/markdown/spec/example-419.md
similarity index 100%
rename from tests/markdown_spec/example-419.md
rename to tests/markdown/spec/example-419.md
diff --git a/tests/markdown_spec/example-42.md b/tests/markdown/spec/example-42.md
similarity index 100%
rename from tests/markdown_spec/example-42.md
rename to tests/markdown/spec/example-42.md
diff --git a/tests/markdown_spec/example-420.md b/tests/markdown/spec/example-420.md
similarity index 100%
rename from tests/markdown_spec/example-420.md
rename to tests/markdown/spec/example-420.md
diff --git a/tests/markdown_spec/example-421.md b/tests/markdown/spec/example-421.md
similarity index 100%
rename from tests/markdown_spec/example-421.md
rename to tests/markdown/spec/example-421.md
diff --git a/tests/markdown_spec/example-422.md b/tests/markdown/spec/example-422.md
similarity index 100%
rename from tests/markdown_spec/example-422.md
rename to tests/markdown/spec/example-422.md
diff --git a/tests/markdown_spec/example-423.md b/tests/markdown/spec/example-423.md
similarity index 100%
rename from tests/markdown_spec/example-423.md
rename to tests/markdown/spec/example-423.md
diff --git a/tests/markdown_spec/example-424.md b/tests/markdown/spec/example-424.md
similarity index 100%
rename from tests/markdown_spec/example-424.md
rename to tests/markdown/spec/example-424.md
diff --git a/tests/markdown_spec/example-425.md b/tests/markdown/spec/example-425.md
similarity index 100%
rename from tests/markdown_spec/example-425.md
rename to tests/markdown/spec/example-425.md
diff --git a/tests/markdown_spec/example-426.md b/tests/markdown/spec/example-426.md
similarity index 100%
rename from tests/markdown_spec/example-426.md
rename to tests/markdown/spec/example-426.md
diff --git a/tests/markdown_spec/example-427.md b/tests/markdown/spec/example-427.md
similarity index 100%
rename from tests/markdown_spec/example-427.md
rename to tests/markdown/spec/example-427.md
diff --git a/tests/markdown_spec/example-428.md b/tests/markdown/spec/example-428.md
similarity index 100%
rename from tests/markdown_spec/example-428.md
rename to tests/markdown/spec/example-428.md
diff --git a/tests/markdown_spec/example-429.md b/tests/markdown/spec/example-429.md
similarity index 100%
rename from tests/markdown_spec/example-429.md
rename to tests/markdown/spec/example-429.md
diff --git a/tests/markdown_spec/example-43.md b/tests/markdown/spec/example-43.md
similarity index 100%
rename from tests/markdown_spec/example-43.md
rename to tests/markdown/spec/example-43.md
diff --git a/tests/markdown_spec/example-430.md b/tests/markdown/spec/example-430.md
similarity index 100%
rename from tests/markdown_spec/example-430.md
rename to tests/markdown/spec/example-430.md
diff --git a/tests/markdown_spec/example-431.md b/tests/markdown/spec/example-431.md
similarity index 100%
rename from tests/markdown_spec/example-431.md
rename to tests/markdown/spec/example-431.md
diff --git a/tests/markdown_spec/example-432.md b/tests/markdown/spec/example-432.md
similarity index 100%
rename from tests/markdown_spec/example-432.md
rename to tests/markdown/spec/example-432.md
diff --git a/tests/markdown_spec/example-433.md b/tests/markdown/spec/example-433.md
similarity index 100%
rename from tests/markdown_spec/example-433.md
rename to tests/markdown/spec/example-433.md
diff --git a/tests/markdown_spec/example-434.md b/tests/markdown/spec/example-434.md
similarity index 100%
rename from tests/markdown_spec/example-434.md
rename to tests/markdown/spec/example-434.md
diff --git a/tests/markdown_spec/example-435.md b/tests/markdown/spec/example-435.md
similarity index 100%
rename from tests/markdown_spec/example-435.md
rename to tests/markdown/spec/example-435.md
diff --git a/tests/markdown_spec/example-436.md b/tests/markdown/spec/example-436.md
similarity index 100%
rename from tests/markdown_spec/example-436.md
rename to tests/markdown/spec/example-436.md
diff --git a/tests/markdown_spec/example-437.md b/tests/markdown/spec/example-437.md
similarity index 100%
rename from tests/markdown_spec/example-437.md
rename to tests/markdown/spec/example-437.md
diff --git a/tests/markdown_spec/example-438.md b/tests/markdown/spec/example-438.md
similarity index 100%
rename from tests/markdown_spec/example-438.md
rename to tests/markdown/spec/example-438.md
diff --git a/tests/markdown_spec/example-439.md b/tests/markdown/spec/example-439.md
similarity index 100%
rename from tests/markdown_spec/example-439.md
rename to tests/markdown/spec/example-439.md
diff --git a/tests/markdown_spec/example-44.md b/tests/markdown/spec/example-44.md
similarity index 100%
rename from tests/markdown_spec/example-44.md
rename to tests/markdown/spec/example-44.md
diff --git a/tests/markdown_spec/example-440.md b/tests/markdown/spec/example-440.md
similarity index 100%
rename from tests/markdown_spec/example-440.md
rename to tests/markdown/spec/example-440.md
diff --git a/tests/markdown_spec/example-441.md b/tests/markdown/spec/example-441.md
similarity index 100%
rename from tests/markdown_spec/example-441.md
rename to tests/markdown/spec/example-441.md
diff --git a/tests/markdown_spec/example-442.md b/tests/markdown/spec/example-442.md
similarity index 100%
rename from tests/markdown_spec/example-442.md
rename to tests/markdown/spec/example-442.md
diff --git a/tests/markdown_spec/example-443.md b/tests/markdown/spec/example-443.md
similarity index 100%
rename from tests/markdown_spec/example-443.md
rename to tests/markdown/spec/example-443.md
diff --git a/tests/markdown_spec/example-444.md b/tests/markdown/spec/example-444.md
similarity index 100%
rename from tests/markdown_spec/example-444.md
rename to tests/markdown/spec/example-444.md
diff --git a/tests/markdown_spec/example-445.md b/tests/markdown/spec/example-445.md
similarity index 100%
rename from tests/markdown_spec/example-445.md
rename to tests/markdown/spec/example-445.md
diff --git a/tests/markdown_spec/example-446.md b/tests/markdown/spec/example-446.md
similarity index 100%
rename from tests/markdown_spec/example-446.md
rename to tests/markdown/spec/example-446.md
diff --git a/tests/markdown_spec/example-447.md b/tests/markdown/spec/example-447.md
similarity index 100%
rename from tests/markdown_spec/example-447.md
rename to tests/markdown/spec/example-447.md
diff --git a/tests/markdown_spec/example-448.md b/tests/markdown/spec/example-448.md
similarity index 100%
rename from tests/markdown_spec/example-448.md
rename to tests/markdown/spec/example-448.md
diff --git a/tests/markdown_spec/example-449.md b/tests/markdown/spec/example-449.md
similarity index 100%
rename from tests/markdown_spec/example-449.md
rename to tests/markdown/spec/example-449.md
diff --git a/tests/markdown_spec/example-45.md b/tests/markdown/spec/example-45.md
similarity index 100%
rename from tests/markdown_spec/example-45.md
rename to tests/markdown/spec/example-45.md
diff --git a/tests/markdown_spec/example-450.md b/tests/markdown/spec/example-450.md
similarity index 100%
rename from tests/markdown_spec/example-450.md
rename to tests/markdown/spec/example-450.md
diff --git a/tests/markdown_spec/example-451.md b/tests/markdown/spec/example-451.md
similarity index 100%
rename from tests/markdown_spec/example-451.md
rename to tests/markdown/spec/example-451.md
diff --git a/tests/markdown_spec/example-452.md b/tests/markdown/spec/example-452.md
similarity index 100%
rename from tests/markdown_spec/example-452.md
rename to tests/markdown/spec/example-452.md
diff --git a/tests/markdown_spec/example-453.md b/tests/markdown/spec/example-453.md
similarity index 100%
rename from tests/markdown_spec/example-453.md
rename to tests/markdown/spec/example-453.md
diff --git a/tests/markdown_spec/example-454.md b/tests/markdown/spec/example-454.md
similarity index 100%
rename from tests/markdown_spec/example-454.md
rename to tests/markdown/spec/example-454.md
diff --git a/tests/markdown_spec/example-455.md b/tests/markdown/spec/example-455.md
similarity index 100%
rename from tests/markdown_spec/example-455.md
rename to tests/markdown/spec/example-455.md
diff --git a/tests/markdown_spec/example-456.md b/tests/markdown/spec/example-456.md
similarity index 100%
rename from tests/markdown_spec/example-456.md
rename to tests/markdown/spec/example-456.md
diff --git a/tests/markdown_spec/example-457.md b/tests/markdown/spec/example-457.md
similarity index 100%
rename from tests/markdown_spec/example-457.md
rename to tests/markdown/spec/example-457.md
diff --git a/tests/markdown_spec/example-458.md b/tests/markdown/spec/example-458.md
similarity index 100%
rename from tests/markdown_spec/example-458.md
rename to tests/markdown/spec/example-458.md
diff --git a/tests/markdown_spec/example-459.md b/tests/markdown/spec/example-459.md
similarity index 100%
rename from tests/markdown_spec/example-459.md
rename to tests/markdown/spec/example-459.md
diff --git a/tests/markdown_spec/example-46.md b/tests/markdown/spec/example-46.md
similarity index 100%
rename from tests/markdown_spec/example-46.md
rename to tests/markdown/spec/example-46.md
diff --git a/tests/markdown_spec/example-460.md b/tests/markdown/spec/example-460.md
similarity index 100%
rename from tests/markdown_spec/example-460.md
rename to tests/markdown/spec/example-460.md
diff --git a/tests/markdown_spec/example-461.md b/tests/markdown/spec/example-461.md
similarity index 100%
rename from tests/markdown_spec/example-461.md
rename to tests/markdown/spec/example-461.md
diff --git a/tests/markdown_spec/example-462.md b/tests/markdown/spec/example-462.md
similarity index 100%
rename from tests/markdown_spec/example-462.md
rename to tests/markdown/spec/example-462.md
diff --git a/tests/markdown_spec/example-463.md b/tests/markdown/spec/example-463.md
similarity index 100%
rename from tests/markdown_spec/example-463.md
rename to tests/markdown/spec/example-463.md
diff --git a/tests/markdown_spec/example-464.md b/tests/markdown/spec/example-464.md
similarity index 100%
rename from tests/markdown_spec/example-464.md
rename to tests/markdown/spec/example-464.md
diff --git a/tests/markdown_spec/example-465.md b/tests/markdown/spec/example-465.md
similarity index 100%
rename from tests/markdown_spec/example-465.md
rename to tests/markdown/spec/example-465.md
diff --git a/tests/markdown_spec/example-466.md b/tests/markdown/spec/example-466.md
similarity index 100%
rename from tests/markdown_spec/example-466.md
rename to tests/markdown/spec/example-466.md
diff --git a/tests/markdown_spec/example-467.md b/tests/markdown/spec/example-467.md
similarity index 100%
rename from tests/markdown_spec/example-467.md
rename to tests/markdown/spec/example-467.md
diff --git a/tests/markdown_spec/example-468.md b/tests/markdown/spec/example-468.md
similarity index 100%
rename from tests/markdown_spec/example-468.md
rename to tests/markdown/spec/example-468.md
diff --git a/tests/markdown_spec/example-469.md b/tests/markdown/spec/example-469.md
similarity index 100%
rename from tests/markdown_spec/example-469.md
rename to tests/markdown/spec/example-469.md
diff --git a/tests/markdown_spec/example-47.md b/tests/markdown/spec/example-47.md
similarity index 100%
rename from tests/markdown_spec/example-47.md
rename to tests/markdown/spec/example-47.md
diff --git a/tests/markdown_spec/example-470.md b/tests/markdown/spec/example-470.md
similarity index 100%
rename from tests/markdown_spec/example-470.md
rename to tests/markdown/spec/example-470.md
diff --git a/tests/markdown_spec/example-471.md b/tests/markdown/spec/example-471.md
similarity index 100%
rename from tests/markdown_spec/example-471.md
rename to tests/markdown/spec/example-471.md
diff --git a/tests/markdown_spec/example-472.md b/tests/markdown/spec/example-472.md
similarity index 100%
rename from tests/markdown_spec/example-472.md
rename to tests/markdown/spec/example-472.md
diff --git a/tests/markdown_spec/example-473.md b/tests/markdown/spec/example-473.md
similarity index 100%
rename from tests/markdown_spec/example-473.md
rename to tests/markdown/spec/example-473.md
diff --git a/tests/markdown_spec/example-474.md b/tests/markdown/spec/example-474.md
similarity index 100%
rename from tests/markdown_spec/example-474.md
rename to tests/markdown/spec/example-474.md
diff --git a/tests/markdown_spec/example-475.md b/tests/markdown/spec/example-475.md
similarity index 100%
rename from tests/markdown_spec/example-475.md
rename to tests/markdown/spec/example-475.md
diff --git a/tests/markdown_spec/example-476.md b/tests/markdown/spec/example-476.md
similarity index 100%
rename from tests/markdown_spec/example-476.md
rename to tests/markdown/spec/example-476.md
diff --git a/tests/markdown_spec/example-477.md b/tests/markdown/spec/example-477.md
similarity index 100%
rename from tests/markdown_spec/example-477.md
rename to tests/markdown/spec/example-477.md
diff --git a/tests/markdown_spec/example-478.md b/tests/markdown/spec/example-478.md
similarity index 100%
rename from tests/markdown_spec/example-478.md
rename to tests/markdown/spec/example-478.md
diff --git a/tests/markdown_spec/example-479.md b/tests/markdown/spec/example-479.md
similarity index 100%
rename from tests/markdown_spec/example-479.md
rename to tests/markdown/spec/example-479.md
diff --git a/tests/markdown_spec/example-48.md b/tests/markdown/spec/example-48.md
similarity index 100%
rename from tests/markdown_spec/example-48.md
rename to tests/markdown/spec/example-48.md
diff --git a/tests/markdown_spec/example-480.md b/tests/markdown/spec/example-480.md
similarity index 100%
rename from tests/markdown_spec/example-480.md
rename to tests/markdown/spec/example-480.md
diff --git a/tests/markdown_spec/example-481.md b/tests/markdown/spec/example-481.md
similarity index 100%
rename from tests/markdown_spec/example-481.md
rename to tests/markdown/spec/example-481.md
diff --git a/tests/markdown_spec/example-482.md b/tests/markdown/spec/example-482.md
similarity index 100%
rename from tests/markdown_spec/example-482.md
rename to tests/markdown/spec/example-482.md
diff --git a/tests/markdown_spec/example-483.md b/tests/markdown/spec/example-483.md
similarity index 100%
rename from tests/markdown_spec/example-483.md
rename to tests/markdown/spec/example-483.md
diff --git a/tests/markdown_spec/example-484.md b/tests/markdown/spec/example-484.md
similarity index 100%
rename from tests/markdown_spec/example-484.md
rename to tests/markdown/spec/example-484.md
diff --git a/tests/markdown_spec/example-485.md b/tests/markdown/spec/example-485.md
similarity index 100%
rename from tests/markdown_spec/example-485.md
rename to tests/markdown/spec/example-485.md
diff --git a/tests/markdown_spec/example-486.md b/tests/markdown/spec/example-486.md
similarity index 100%
rename from tests/markdown_spec/example-486.md
rename to tests/markdown/spec/example-486.md
diff --git a/tests/markdown_spec/example-487.md b/tests/markdown/spec/example-487.md
similarity index 100%
rename from tests/markdown_spec/example-487.md
rename to tests/markdown/spec/example-487.md
diff --git a/tests/markdown_spec/example-488.md b/tests/markdown/spec/example-488.md
similarity index 100%
rename from tests/markdown_spec/example-488.md
rename to tests/markdown/spec/example-488.md
diff --git a/tests/markdown_spec/example-489.md b/tests/markdown/spec/example-489.md
similarity index 100%
rename from tests/markdown_spec/example-489.md
rename to tests/markdown/spec/example-489.md
diff --git a/tests/markdown_spec/example-49.md b/tests/markdown/spec/example-49.md
similarity index 100%
rename from tests/markdown_spec/example-49.md
rename to tests/markdown/spec/example-49.md
diff --git a/tests/markdown_spec/example-490.md b/tests/markdown/spec/example-490.md
similarity index 100%
rename from tests/markdown_spec/example-490.md
rename to tests/markdown/spec/example-490.md
diff --git a/tests/markdown_spec/example-491.md b/tests/markdown/spec/example-491.md
similarity index 100%
rename from tests/markdown_spec/example-491.md
rename to tests/markdown/spec/example-491.md
diff --git a/tests/markdown_spec/example-492.md b/tests/markdown/spec/example-492.md
similarity index 100%
rename from tests/markdown_spec/example-492.md
rename to tests/markdown/spec/example-492.md
diff --git a/tests/markdown_spec/example-493.md b/tests/markdown/spec/example-493.md
similarity index 100%
rename from tests/markdown_spec/example-493.md
rename to tests/markdown/spec/example-493.md
diff --git a/tests/markdown_spec/example-494.md b/tests/markdown/spec/example-494.md
similarity index 100%
rename from tests/markdown_spec/example-494.md
rename to tests/markdown/spec/example-494.md
diff --git a/tests/markdown_spec/example-495.md b/tests/markdown/spec/example-495.md
similarity index 100%
rename from tests/markdown_spec/example-495.md
rename to tests/markdown/spec/example-495.md
diff --git a/tests/markdown_spec/example-496.md b/tests/markdown/spec/example-496.md
similarity index 100%
rename from tests/markdown_spec/example-496.md
rename to tests/markdown/spec/example-496.md
diff --git a/tests/markdown_spec/example-497.md b/tests/markdown/spec/example-497.md
similarity index 100%
rename from tests/markdown_spec/example-497.md
rename to tests/markdown/spec/example-497.md
diff --git a/tests/markdown_spec/example-498.md b/tests/markdown/spec/example-498.md
similarity index 100%
rename from tests/markdown_spec/example-498.md
rename to tests/markdown/spec/example-498.md
diff --git a/tests/markdown_spec/example-499.md b/tests/markdown/spec/example-499.md
similarity index 100%
rename from tests/markdown_spec/example-499.md
rename to tests/markdown/spec/example-499.md
diff --git a/tests/markdown_spec/example-5.md b/tests/markdown/spec/example-5.md
similarity index 100%
rename from tests/markdown_spec/example-5.md
rename to tests/markdown/spec/example-5.md
diff --git a/tests/markdown_spec/example-50.md b/tests/markdown/spec/example-50.md
similarity index 100%
rename from tests/markdown_spec/example-50.md
rename to tests/markdown/spec/example-50.md
diff --git a/tests/markdown_spec/example-500.md b/tests/markdown/spec/example-500.md
similarity index 100%
rename from tests/markdown_spec/example-500.md
rename to tests/markdown/spec/example-500.md
diff --git a/tests/markdown_spec/example-501.md b/tests/markdown/spec/example-501.md
similarity index 100%
rename from tests/markdown_spec/example-501.md
rename to tests/markdown/spec/example-501.md
diff --git a/tests/markdown_spec/example-502.md b/tests/markdown/spec/example-502.md
similarity index 100%
rename from tests/markdown_spec/example-502.md
rename to tests/markdown/spec/example-502.md
diff --git a/tests/markdown_spec/example-503.md b/tests/markdown/spec/example-503.md
similarity index 100%
rename from tests/markdown_spec/example-503.md
rename to tests/markdown/spec/example-503.md
diff --git a/tests/markdown_spec/example-504.md b/tests/markdown/spec/example-504.md
similarity index 100%
rename from tests/markdown_spec/example-504.md
rename to tests/markdown/spec/example-504.md
diff --git a/tests/markdown_spec/example-505.md b/tests/markdown/spec/example-505.md
similarity index 100%
rename from tests/markdown_spec/example-505.md
rename to tests/markdown/spec/example-505.md
diff --git a/tests/markdown_spec/example-506.md b/tests/markdown/spec/example-506.md
similarity index 100%
rename from tests/markdown_spec/example-506.md
rename to tests/markdown/spec/example-506.md
diff --git a/tests/markdown_spec/example-507.md b/tests/markdown/spec/example-507.md
similarity index 100%
rename from tests/markdown_spec/example-507.md
rename to tests/markdown/spec/example-507.md
diff --git a/tests/markdown_spec/example-508.md b/tests/markdown/spec/example-508.md
similarity index 100%
rename from tests/markdown_spec/example-508.md
rename to tests/markdown/spec/example-508.md
diff --git a/tests/markdown_spec/example-509.md b/tests/markdown/spec/example-509.md
similarity index 100%
rename from tests/markdown_spec/example-509.md
rename to tests/markdown/spec/example-509.md
diff --git a/tests/markdown_spec/example-51.md b/tests/markdown/spec/example-51.md
similarity index 100%
rename from tests/markdown_spec/example-51.md
rename to tests/markdown/spec/example-51.md
diff --git a/tests/markdown_spec/example-510.md b/tests/markdown/spec/example-510.md
similarity index 100%
rename from tests/markdown_spec/example-510.md
rename to tests/markdown/spec/example-510.md
diff --git a/tests/markdown_spec/example-511.md b/tests/markdown/spec/example-511.md
similarity index 100%
rename from tests/markdown_spec/example-511.md
rename to tests/markdown/spec/example-511.md
diff --git a/tests/markdown_spec/example-512.md b/tests/markdown/spec/example-512.md
similarity index 100%
rename from tests/markdown_spec/example-512.md
rename to tests/markdown/spec/example-512.md
diff --git a/tests/markdown_spec/example-513.md b/tests/markdown/spec/example-513.md
similarity index 100%
rename from tests/markdown_spec/example-513.md
rename to tests/markdown/spec/example-513.md
diff --git a/tests/markdown_spec/example-514.md b/tests/markdown/spec/example-514.md
similarity index 100%
rename from tests/markdown_spec/example-514.md
rename to tests/markdown/spec/example-514.md
diff --git a/tests/markdown_spec/example-515.md b/tests/markdown/spec/example-515.md
similarity index 100%
rename from tests/markdown_spec/example-515.md
rename to tests/markdown/spec/example-515.md
diff --git a/tests/markdown_spec/example-516.md b/tests/markdown/spec/example-516.md
similarity index 100%
rename from tests/markdown_spec/example-516.md
rename to tests/markdown/spec/example-516.md
diff --git a/tests/markdown_spec/example-517.md b/tests/markdown/spec/example-517.md
similarity index 100%
rename from tests/markdown_spec/example-517.md
rename to tests/markdown/spec/example-517.md
diff --git a/tests/markdown_spec/example-518.md b/tests/markdown/spec/example-518.md
similarity index 100%
rename from tests/markdown_spec/example-518.md
rename to tests/markdown/spec/example-518.md
diff --git a/tests/markdown_spec/example-519.md b/tests/markdown/spec/example-519.md
similarity index 100%
rename from tests/markdown_spec/example-519.md
rename to tests/markdown/spec/example-519.md
diff --git a/tests/markdown_spec/example-52.md b/tests/markdown/spec/example-52.md
similarity index 100%
rename from tests/markdown_spec/example-52.md
rename to tests/markdown/spec/example-52.md
diff --git a/tests/markdown_spec/example-520.md b/tests/markdown/spec/example-520.md
similarity index 100%
rename from tests/markdown_spec/example-520.md
rename to tests/markdown/spec/example-520.md
diff --git a/tests/markdown_spec/example-521.md b/tests/markdown/spec/example-521.md
similarity index 100%
rename from tests/markdown_spec/example-521.md
rename to tests/markdown/spec/example-521.md
diff --git a/tests/markdown_spec/example-522.md b/tests/markdown/spec/example-522.md
similarity index 100%
rename from tests/markdown_spec/example-522.md
rename to tests/markdown/spec/example-522.md
diff --git a/tests/markdown_spec/example-523.md b/tests/markdown/spec/example-523.md
similarity index 100%
rename from tests/markdown_spec/example-523.md
rename to tests/markdown/spec/example-523.md
diff --git a/tests/markdown_spec/example-524.md b/tests/markdown/spec/example-524.md
similarity index 100%
rename from tests/markdown_spec/example-524.md
rename to tests/markdown/spec/example-524.md
diff --git a/tests/markdown_spec/example-525.md b/tests/markdown/spec/example-525.md
similarity index 100%
rename from tests/markdown_spec/example-525.md
rename to tests/markdown/spec/example-525.md
diff --git a/tests/markdown_spec/example-526.md b/tests/markdown/spec/example-526.md
similarity index 100%
rename from tests/markdown_spec/example-526.md
rename to tests/markdown/spec/example-526.md
diff --git a/tests/markdown_spec/example-527.md b/tests/markdown/spec/example-527.md
similarity index 100%
rename from tests/markdown_spec/example-527.md
rename to tests/markdown/spec/example-527.md
diff --git a/tests/markdown_spec/example-528.md b/tests/markdown/spec/example-528.md
similarity index 100%
rename from tests/markdown_spec/example-528.md
rename to tests/markdown/spec/example-528.md
diff --git a/tests/markdown_spec/example-529.md b/tests/markdown/spec/example-529.md
similarity index 100%
rename from tests/markdown_spec/example-529.md
rename to tests/markdown/spec/example-529.md
diff --git a/tests/markdown_spec/example-53.md b/tests/markdown/spec/example-53.md
similarity index 100%
rename from tests/markdown_spec/example-53.md
rename to tests/markdown/spec/example-53.md
diff --git a/tests/markdown_spec/example-530.md b/tests/markdown/spec/example-530.md
similarity index 100%
rename from tests/markdown_spec/example-530.md
rename to tests/markdown/spec/example-530.md
diff --git a/tests/markdown_spec/example-531.md b/tests/markdown/spec/example-531.md
similarity index 100%
rename from tests/markdown_spec/example-531.md
rename to tests/markdown/spec/example-531.md
diff --git a/tests/markdown_spec/example-532.md b/tests/markdown/spec/example-532.md
similarity index 100%
rename from tests/markdown_spec/example-532.md
rename to tests/markdown/spec/example-532.md
diff --git a/tests/markdown_spec/example-533.md b/tests/markdown/spec/example-533.md
similarity index 100%
rename from tests/markdown_spec/example-533.md
rename to tests/markdown/spec/example-533.md
diff --git a/tests/markdown_spec/example-534.md b/tests/markdown/spec/example-534.md
similarity index 100%
rename from tests/markdown_spec/example-534.md
rename to tests/markdown/spec/example-534.md
diff --git a/tests/markdown_spec/example-535.md b/tests/markdown/spec/example-535.md
similarity index 100%
rename from tests/markdown_spec/example-535.md
rename to tests/markdown/spec/example-535.md
diff --git a/tests/markdown_spec/example-536.md b/tests/markdown/spec/example-536.md
similarity index 100%
rename from tests/markdown_spec/example-536.md
rename to tests/markdown/spec/example-536.md
diff --git a/tests/markdown_spec/example-537.md b/tests/markdown/spec/example-537.md
similarity index 100%
rename from tests/markdown_spec/example-537.md
rename to tests/markdown/spec/example-537.md
diff --git a/tests/markdown_spec/example-538.md b/tests/markdown/spec/example-538.md
similarity index 100%
rename from tests/markdown_spec/example-538.md
rename to tests/markdown/spec/example-538.md
diff --git a/tests/markdown_spec/example-539.md b/tests/markdown/spec/example-539.md
similarity index 100%
rename from tests/markdown_spec/example-539.md
rename to tests/markdown/spec/example-539.md
diff --git a/tests/markdown_spec/example-54.md b/tests/markdown/spec/example-54.md
similarity index 100%
rename from tests/markdown_spec/example-54.md
rename to tests/markdown/spec/example-54.md
diff --git a/tests/markdown_spec/example-540.md b/tests/markdown/spec/example-540.md
similarity index 100%
rename from tests/markdown_spec/example-540.md
rename to tests/markdown/spec/example-540.md
diff --git a/tests/markdown_spec/example-541.md b/tests/markdown/spec/example-541.md
similarity index 100%
rename from tests/markdown_spec/example-541.md
rename to tests/markdown/spec/example-541.md
diff --git a/tests/markdown_spec/example-542.md b/tests/markdown/spec/example-542.md
similarity index 100%
rename from tests/markdown_spec/example-542.md
rename to tests/markdown/spec/example-542.md
diff --git a/tests/markdown_spec/example-543.md b/tests/markdown/spec/example-543.md
similarity index 100%
rename from tests/markdown_spec/example-543.md
rename to tests/markdown/spec/example-543.md
diff --git a/tests/markdown_spec/example-544.md b/tests/markdown/spec/example-544.md
similarity index 100%
rename from tests/markdown_spec/example-544.md
rename to tests/markdown/spec/example-544.md
diff --git a/tests/markdown_spec/example-545.md b/tests/markdown/spec/example-545.md
similarity index 100%
rename from tests/markdown_spec/example-545.md
rename to tests/markdown/spec/example-545.md
diff --git a/tests/markdown_spec/example-546.md b/tests/markdown/spec/example-546.md
similarity index 100%
rename from tests/markdown_spec/example-546.md
rename to tests/markdown/spec/example-546.md
diff --git a/tests/markdown_spec/example-547.md b/tests/markdown/spec/example-547.md
similarity index 100%
rename from tests/markdown_spec/example-547.md
rename to tests/markdown/spec/example-547.md
diff --git a/tests/markdown_spec/example-548.md b/tests/markdown/spec/example-548.md
similarity index 100%
rename from tests/markdown_spec/example-548.md
rename to tests/markdown/spec/example-548.md
diff --git a/tests/markdown_spec/example-549.md b/tests/markdown/spec/example-549.md
similarity index 100%
rename from tests/markdown_spec/example-549.md
rename to tests/markdown/spec/example-549.md
diff --git a/tests/markdown_spec/example-55.md b/tests/markdown/spec/example-55.md
similarity index 100%
rename from tests/markdown_spec/example-55.md
rename to tests/markdown/spec/example-55.md
diff --git a/tests/markdown_spec/example-550.md b/tests/markdown/spec/example-550.md
similarity index 100%
rename from tests/markdown_spec/example-550.md
rename to tests/markdown/spec/example-550.md
diff --git a/tests/markdown_spec/example-551.md b/tests/markdown/spec/example-551.md
similarity index 100%
rename from tests/markdown_spec/example-551.md
rename to tests/markdown/spec/example-551.md
diff --git a/tests/markdown_spec/example-552.md b/tests/markdown/spec/example-552.md
similarity index 100%
rename from tests/markdown_spec/example-552.md
rename to tests/markdown/spec/example-552.md
diff --git a/tests/markdown_spec/example-553.md b/tests/markdown/spec/example-553.md
similarity index 100%
rename from tests/markdown_spec/example-553.md
rename to tests/markdown/spec/example-553.md
diff --git a/tests/markdown_spec/example-554.md b/tests/markdown/spec/example-554.md
similarity index 100%
rename from tests/markdown_spec/example-554.md
rename to tests/markdown/spec/example-554.md
diff --git a/tests/markdown_spec/example-555.md b/tests/markdown/spec/example-555.md
similarity index 100%
rename from tests/markdown_spec/example-555.md
rename to tests/markdown/spec/example-555.md
diff --git a/tests/markdown_spec/example-556.md b/tests/markdown/spec/example-556.md
similarity index 100%
rename from tests/markdown_spec/example-556.md
rename to tests/markdown/spec/example-556.md
diff --git a/tests/markdown_spec/example-557.md b/tests/markdown/spec/example-557.md
similarity index 100%
rename from tests/markdown_spec/example-557.md
rename to tests/markdown/spec/example-557.md
diff --git a/tests/markdown_spec/example-558.md b/tests/markdown/spec/example-558.md
similarity index 100%
rename from tests/markdown_spec/example-558.md
rename to tests/markdown/spec/example-558.md
diff --git a/tests/markdown_spec/example-559.md b/tests/markdown/spec/example-559.md
similarity index 100%
rename from tests/markdown_spec/example-559.md
rename to tests/markdown/spec/example-559.md
diff --git a/tests/markdown_spec/example-56.md b/tests/markdown/spec/example-56.md
similarity index 100%
rename from tests/markdown_spec/example-56.md
rename to tests/markdown/spec/example-56.md
diff --git a/tests/markdown_spec/example-560.md b/tests/markdown/spec/example-560.md
similarity index 100%
rename from tests/markdown_spec/example-560.md
rename to tests/markdown/spec/example-560.md
diff --git a/tests/markdown_spec/example-561.md b/tests/markdown/spec/example-561.md
similarity index 100%
rename from tests/markdown_spec/example-561.md
rename to tests/markdown/spec/example-561.md
diff --git a/tests/markdown_spec/example-562.md b/tests/markdown/spec/example-562.md
similarity index 100%
rename from tests/markdown_spec/example-562.md
rename to tests/markdown/spec/example-562.md
diff --git a/tests/markdown_spec/example-563.md b/tests/markdown/spec/example-563.md
similarity index 100%
rename from tests/markdown_spec/example-563.md
rename to tests/markdown/spec/example-563.md
diff --git a/tests/markdown_spec/example-564.md b/tests/markdown/spec/example-564.md
similarity index 100%
rename from tests/markdown_spec/example-564.md
rename to tests/markdown/spec/example-564.md
diff --git a/tests/markdown_spec/example-565.md b/tests/markdown/spec/example-565.md
similarity index 100%
rename from tests/markdown_spec/example-565.md
rename to tests/markdown/spec/example-565.md
diff --git a/tests/markdown_spec/example-566.md b/tests/markdown/spec/example-566.md
similarity index 100%
rename from tests/markdown_spec/example-566.md
rename to tests/markdown/spec/example-566.md
diff --git a/tests/markdown_spec/example-567.md b/tests/markdown/spec/example-567.md
similarity index 100%
rename from tests/markdown_spec/example-567.md
rename to tests/markdown/spec/example-567.md
diff --git a/tests/markdown_spec/example-568.md b/tests/markdown/spec/example-568.md
similarity index 100%
rename from tests/markdown_spec/example-568.md
rename to tests/markdown/spec/example-568.md
diff --git a/tests/markdown_spec/example-569.md b/tests/markdown/spec/example-569.md
similarity index 100%
rename from tests/markdown_spec/example-569.md
rename to tests/markdown/spec/example-569.md
diff --git a/tests/markdown_spec/example-57.md b/tests/markdown/spec/example-57.md
similarity index 100%
rename from tests/markdown_spec/example-57.md
rename to tests/markdown/spec/example-57.md
diff --git a/tests/markdown_spec/example-570.md b/tests/markdown/spec/example-570.md
similarity index 100%
rename from tests/markdown_spec/example-570.md
rename to tests/markdown/spec/example-570.md
diff --git a/tests/markdown_spec/example-571.md b/tests/markdown/spec/example-571.md
similarity index 100%
rename from tests/markdown_spec/example-571.md
rename to tests/markdown/spec/example-571.md
diff --git a/tests/markdown_spec/example-572.md b/tests/markdown/spec/example-572.md
similarity index 100%
rename from tests/markdown_spec/example-572.md
rename to tests/markdown/spec/example-572.md
diff --git a/tests/markdown_spec/example-573.md b/tests/markdown/spec/example-573.md
similarity index 100%
rename from tests/markdown_spec/example-573.md
rename to tests/markdown/spec/example-573.md
diff --git a/tests/markdown_spec/example-574.md b/tests/markdown/spec/example-574.md
similarity index 100%
rename from tests/markdown_spec/example-574.md
rename to tests/markdown/spec/example-574.md
diff --git a/tests/markdown_spec/example-575.md b/tests/markdown/spec/example-575.md
similarity index 100%
rename from tests/markdown_spec/example-575.md
rename to tests/markdown/spec/example-575.md
diff --git a/tests/markdown_spec/example-576.md b/tests/markdown/spec/example-576.md
similarity index 100%
rename from tests/markdown_spec/example-576.md
rename to tests/markdown/spec/example-576.md
diff --git a/tests/markdown_spec/example-577.md b/tests/markdown/spec/example-577.md
similarity index 100%
rename from tests/markdown_spec/example-577.md
rename to tests/markdown/spec/example-577.md
diff --git a/tests/markdown_spec/example-578.md b/tests/markdown/spec/example-578.md
similarity index 100%
rename from tests/markdown_spec/example-578.md
rename to tests/markdown/spec/example-578.md
diff --git a/tests/markdown_spec/example-579.md b/tests/markdown/spec/example-579.md
similarity index 100%
rename from tests/markdown_spec/example-579.md
rename to tests/markdown/spec/example-579.md
diff --git a/tests/markdown_spec/example-58.md b/tests/markdown/spec/example-58.md
similarity index 100%
rename from tests/markdown_spec/example-58.md
rename to tests/markdown/spec/example-58.md
diff --git a/tests/markdown_spec/example-580.md b/tests/markdown/spec/example-580.md
similarity index 100%
rename from tests/markdown_spec/example-580.md
rename to tests/markdown/spec/example-580.md
diff --git a/tests/markdown_spec/example-581.md b/tests/markdown/spec/example-581.md
similarity index 100%
rename from tests/markdown_spec/example-581.md
rename to tests/markdown/spec/example-581.md
diff --git a/tests/markdown_spec/example-582.md b/tests/markdown/spec/example-582.md
similarity index 100%
rename from tests/markdown_spec/example-582.md
rename to tests/markdown/spec/example-582.md
diff --git a/tests/markdown_spec/example-583.md b/tests/markdown/spec/example-583.md
similarity index 100%
rename from tests/markdown_spec/example-583.md
rename to tests/markdown/spec/example-583.md
diff --git a/tests/markdown_spec/example-584.md b/tests/markdown/spec/example-584.md
similarity index 100%
rename from tests/markdown_spec/example-584.md
rename to tests/markdown/spec/example-584.md
diff --git a/tests/markdown_spec/example-585.md b/tests/markdown/spec/example-585.md
similarity index 100%
rename from tests/markdown_spec/example-585.md
rename to tests/markdown/spec/example-585.md
diff --git a/tests/markdown_spec/example-586.md b/tests/markdown/spec/example-586.md
similarity index 100%
rename from tests/markdown_spec/example-586.md
rename to tests/markdown/spec/example-586.md
diff --git a/tests/markdown_spec/example-587.md b/tests/markdown/spec/example-587.md
similarity index 100%
rename from tests/markdown_spec/example-587.md
rename to tests/markdown/spec/example-587.md
diff --git a/tests/markdown_spec/example-588.md b/tests/markdown/spec/example-588.md
similarity index 100%
rename from tests/markdown_spec/example-588.md
rename to tests/markdown/spec/example-588.md
diff --git a/tests/markdown_spec/example-589.md b/tests/markdown/spec/example-589.md
similarity index 100%
rename from tests/markdown_spec/example-589.md
rename to tests/markdown/spec/example-589.md
diff --git a/tests/markdown_spec/example-59.md b/tests/markdown/spec/example-59.md
similarity index 100%
rename from tests/markdown_spec/example-59.md
rename to tests/markdown/spec/example-59.md
diff --git a/tests/markdown_spec/example-590.md b/tests/markdown/spec/example-590.md
similarity index 100%
rename from tests/markdown_spec/example-590.md
rename to tests/markdown/spec/example-590.md
diff --git a/tests/markdown_spec/example-591.md b/tests/markdown/spec/example-591.md
similarity index 100%
rename from tests/markdown_spec/example-591.md
rename to tests/markdown/spec/example-591.md
diff --git a/tests/markdown_spec/example-592.md b/tests/markdown/spec/example-592.md
similarity index 100%
rename from tests/markdown_spec/example-592.md
rename to tests/markdown/spec/example-592.md
diff --git a/tests/markdown_spec/example-593.md b/tests/markdown/spec/example-593.md
similarity index 100%
rename from tests/markdown_spec/example-593.md
rename to tests/markdown/spec/example-593.md
diff --git a/tests/markdown_spec/example-594.md b/tests/markdown/spec/example-594.md
similarity index 100%
rename from tests/markdown_spec/example-594.md
rename to tests/markdown/spec/example-594.md
diff --git a/tests/markdown_spec/example-595.md b/tests/markdown/spec/example-595.md
similarity index 100%
rename from tests/markdown_spec/example-595.md
rename to tests/markdown/spec/example-595.md
diff --git a/tests/markdown_spec/example-596.md b/tests/markdown/spec/example-596.md
similarity index 100%
rename from tests/markdown_spec/example-596.md
rename to tests/markdown/spec/example-596.md
diff --git a/tests/markdown_spec/example-597.md b/tests/markdown/spec/example-597.md
similarity index 100%
rename from tests/markdown_spec/example-597.md
rename to tests/markdown/spec/example-597.md
diff --git a/tests/markdown_spec/example-598.md b/tests/markdown/spec/example-598.md
similarity index 100%
rename from tests/markdown_spec/example-598.md
rename to tests/markdown/spec/example-598.md
diff --git a/tests/markdown_spec/example-599.md b/tests/markdown/spec/example-599.md
similarity index 100%
rename from tests/markdown_spec/example-599.md
rename to tests/markdown/spec/example-599.md
diff --git a/tests/markdown_spec/example-6.md b/tests/markdown/spec/example-6.md
similarity index 100%
rename from tests/markdown_spec/example-6.md
rename to tests/markdown/spec/example-6.md
diff --git a/tests/markdown_spec/example-60.md b/tests/markdown/spec/example-60.md
similarity index 100%
rename from tests/markdown_spec/example-60.md
rename to tests/markdown/spec/example-60.md
diff --git a/tests/markdown_spec/example-600.md b/tests/markdown/spec/example-600.md
similarity index 100%
rename from tests/markdown_spec/example-600.md
rename to tests/markdown/spec/example-600.md
diff --git a/tests/markdown_spec/example-601.md b/tests/markdown/spec/example-601.md
similarity index 100%
rename from tests/markdown_spec/example-601.md
rename to tests/markdown/spec/example-601.md
diff --git a/tests/markdown_spec/example-602.md b/tests/markdown/spec/example-602.md
similarity index 100%
rename from tests/markdown_spec/example-602.md
rename to tests/markdown/spec/example-602.md
diff --git a/tests/markdown_spec/example-603.md b/tests/markdown/spec/example-603.md
similarity index 100%
rename from tests/markdown_spec/example-603.md
rename to tests/markdown/spec/example-603.md
diff --git a/tests/markdown_spec/example-604.md b/tests/markdown/spec/example-604.md
similarity index 100%
rename from tests/markdown_spec/example-604.md
rename to tests/markdown/spec/example-604.md
diff --git a/tests/markdown_spec/example-605.md b/tests/markdown/spec/example-605.md
similarity index 100%
rename from tests/markdown_spec/example-605.md
rename to tests/markdown/spec/example-605.md
diff --git a/tests/markdown_spec/example-606.md b/tests/markdown/spec/example-606.md
similarity index 100%
rename from tests/markdown_spec/example-606.md
rename to tests/markdown/spec/example-606.md
diff --git a/tests/markdown_spec/example-607.md b/tests/markdown/spec/example-607.md
similarity index 100%
rename from tests/markdown_spec/example-607.md
rename to tests/markdown/spec/example-607.md
diff --git a/tests/markdown_spec/example-608.md b/tests/markdown/spec/example-608.md
similarity index 100%
rename from tests/markdown_spec/example-608.md
rename to tests/markdown/spec/example-608.md
diff --git a/tests/markdown_spec/example-609.md b/tests/markdown/spec/example-609.md
similarity index 100%
rename from tests/markdown_spec/example-609.md
rename to tests/markdown/spec/example-609.md
diff --git a/tests/markdown_spec/example-61.md b/tests/markdown/spec/example-61.md
similarity index 100%
rename from tests/markdown_spec/example-61.md
rename to tests/markdown/spec/example-61.md
diff --git a/tests/markdown_spec/example-610.md b/tests/markdown/spec/example-610.md
similarity index 100%
rename from tests/markdown_spec/example-610.md
rename to tests/markdown/spec/example-610.md
diff --git a/tests/markdown_spec/example-611.md b/tests/markdown/spec/example-611.md
similarity index 100%
rename from tests/markdown_spec/example-611.md
rename to tests/markdown/spec/example-611.md
diff --git a/tests/markdown_spec/example-612.md b/tests/markdown/spec/example-612.md
similarity index 100%
rename from tests/markdown_spec/example-612.md
rename to tests/markdown/spec/example-612.md
diff --git a/tests/markdown_spec/example-613.md b/tests/markdown/spec/example-613.md
similarity index 100%
rename from tests/markdown_spec/example-613.md
rename to tests/markdown/spec/example-613.md
diff --git a/tests/markdown_spec/example-614.md b/tests/markdown/spec/example-614.md
similarity index 100%
rename from tests/markdown_spec/example-614.md
rename to tests/markdown/spec/example-614.md
diff --git a/tests/markdown_spec/example-615.md b/tests/markdown/spec/example-615.md
similarity index 100%
rename from tests/markdown_spec/example-615.md
rename to tests/markdown/spec/example-615.md
diff --git a/tests/markdown_spec/example-616.md b/tests/markdown/spec/example-616.md
similarity index 100%
rename from tests/markdown_spec/example-616.md
rename to tests/markdown/spec/example-616.md
diff --git a/tests/markdown_spec/example-62.md b/tests/markdown/spec/example-62.md
similarity index 100%
rename from tests/markdown_spec/example-62.md
rename to tests/markdown/spec/example-62.md
diff --git a/tests/markdown_spec/example-63.md b/tests/markdown/spec/example-63.md
similarity index 100%
rename from tests/markdown_spec/example-63.md
rename to tests/markdown/spec/example-63.md
diff --git a/tests/markdown_spec/example-64.md b/tests/markdown/spec/example-64.md
similarity index 100%
rename from tests/markdown_spec/example-64.md
rename to tests/markdown/spec/example-64.md
diff --git a/tests/markdown_spec/example-65.md b/tests/markdown/spec/example-65.md
similarity index 100%
rename from tests/markdown_spec/example-65.md
rename to tests/markdown/spec/example-65.md
diff --git a/tests/markdown_spec/example-66.md b/tests/markdown/spec/example-66.md
similarity index 100%
rename from tests/markdown_spec/example-66.md
rename to tests/markdown/spec/example-66.md
diff --git a/tests/markdown_spec/example-67.md b/tests/markdown/spec/example-67.md
similarity index 100%
rename from tests/markdown_spec/example-67.md
rename to tests/markdown/spec/example-67.md
diff --git a/tests/markdown_spec/example-68.md b/tests/markdown/spec/example-68.md
similarity index 100%
rename from tests/markdown_spec/example-68.md
rename to tests/markdown/spec/example-68.md
diff --git a/tests/markdown_spec/example-69.md b/tests/markdown/spec/example-69.md
similarity index 100%
rename from tests/markdown_spec/example-69.md
rename to tests/markdown/spec/example-69.md
diff --git a/tests/markdown_spec/example-7.md b/tests/markdown/spec/example-7.md
similarity index 100%
rename from tests/markdown_spec/example-7.md
rename to tests/markdown/spec/example-7.md
diff --git a/tests/markdown_spec/example-70.md b/tests/markdown/spec/example-70.md
similarity index 100%
rename from tests/markdown_spec/example-70.md
rename to tests/markdown/spec/example-70.md
diff --git a/tests/markdown_spec/example-71.md b/tests/markdown/spec/example-71.md
similarity index 100%
rename from tests/markdown_spec/example-71.md
rename to tests/markdown/spec/example-71.md
diff --git a/tests/markdown_spec/example-72.md b/tests/markdown/spec/example-72.md
similarity index 100%
rename from tests/markdown_spec/example-72.md
rename to tests/markdown/spec/example-72.md
diff --git a/tests/markdown_spec/example-73.md b/tests/markdown/spec/example-73.md
similarity index 100%
rename from tests/markdown_spec/example-73.md
rename to tests/markdown/spec/example-73.md
diff --git a/tests/markdown_spec/example-74.md b/tests/markdown/spec/example-74.md
similarity index 100%
rename from tests/markdown_spec/example-74.md
rename to tests/markdown/spec/example-74.md
diff --git a/tests/markdown_spec/example-75.md b/tests/markdown/spec/example-75.md
similarity index 100%
rename from tests/markdown_spec/example-75.md
rename to tests/markdown/spec/example-75.md
diff --git a/tests/markdown_spec/example-76.md b/tests/markdown/spec/example-76.md
similarity index 100%
rename from tests/markdown_spec/example-76.md
rename to tests/markdown/spec/example-76.md
diff --git a/tests/markdown_spec/example-77.md b/tests/markdown/spec/example-77.md
similarity index 100%
rename from tests/markdown_spec/example-77.md
rename to tests/markdown/spec/example-77.md
diff --git a/tests/markdown_spec/example-78.md b/tests/markdown/spec/example-78.md
similarity index 100%
rename from tests/markdown_spec/example-78.md
rename to tests/markdown/spec/example-78.md
diff --git a/tests/markdown_spec/example-79.md b/tests/markdown/spec/example-79.md
similarity index 100%
rename from tests/markdown_spec/example-79.md
rename to tests/markdown/spec/example-79.md
diff --git a/tests/markdown_spec/example-8.md b/tests/markdown/spec/example-8.md
similarity index 100%
rename from tests/markdown_spec/example-8.md
rename to tests/markdown/spec/example-8.md
diff --git a/tests/markdown_spec/example-80.md b/tests/markdown/spec/example-80.md
similarity index 100%
rename from tests/markdown_spec/example-80.md
rename to tests/markdown/spec/example-80.md
diff --git a/tests/markdown_spec/example-81.md b/tests/markdown/spec/example-81.md
similarity index 100%
rename from tests/markdown_spec/example-81.md
rename to tests/markdown/spec/example-81.md
diff --git a/tests/markdown_spec/example-82.md b/tests/markdown/spec/example-82.md
similarity index 100%
rename from tests/markdown_spec/example-82.md
rename to tests/markdown/spec/example-82.md
diff --git a/tests/markdown_spec/example-83.md b/tests/markdown/spec/example-83.md
similarity index 100%
rename from tests/markdown_spec/example-83.md
rename to tests/markdown/spec/example-83.md
diff --git a/tests/markdown_spec/example-84.md b/tests/markdown/spec/example-84.md
similarity index 100%
rename from tests/markdown_spec/example-84.md
rename to tests/markdown/spec/example-84.md
diff --git a/tests/markdown_spec/example-85.md b/tests/markdown/spec/example-85.md
similarity index 100%
rename from tests/markdown_spec/example-85.md
rename to tests/markdown/spec/example-85.md
diff --git a/tests/markdown_spec/example-86.md b/tests/markdown/spec/example-86.md
similarity index 100%
rename from tests/markdown_spec/example-86.md
rename to tests/markdown/spec/example-86.md
diff --git a/tests/markdown_spec/example-87.md b/tests/markdown/spec/example-87.md
similarity index 100%
rename from tests/markdown_spec/example-87.md
rename to tests/markdown/spec/example-87.md
diff --git a/tests/markdown_spec/example-88.md b/tests/markdown/spec/example-88.md
similarity index 100%
rename from tests/markdown_spec/example-88.md
rename to tests/markdown/spec/example-88.md
diff --git a/tests/markdown_spec/example-89.md b/tests/markdown/spec/example-89.md
similarity index 100%
rename from tests/markdown_spec/example-89.md
rename to tests/markdown/spec/example-89.md
diff --git a/tests/markdown_spec/example-9.md b/tests/markdown/spec/example-9.md
similarity index 100%
rename from tests/markdown_spec/example-9.md
rename to tests/markdown/spec/example-9.md
diff --git a/tests/markdown_spec/example-90.md b/tests/markdown/spec/example-90.md
similarity index 100%
rename from tests/markdown_spec/example-90.md
rename to tests/markdown/spec/example-90.md
diff --git a/tests/markdown_spec/example-91.md b/tests/markdown/spec/example-91.md
similarity index 100%
rename from tests/markdown_spec/example-91.md
rename to tests/markdown/spec/example-91.md
diff --git a/tests/markdown_spec/example-92.md b/tests/markdown/spec/example-92.md
similarity index 100%
rename from tests/markdown_spec/example-92.md
rename to tests/markdown/spec/example-92.md
diff --git a/tests/markdown_spec/example-93.md b/tests/markdown/spec/example-93.md
similarity index 100%
rename from tests/markdown_spec/example-93.md
rename to tests/markdown/spec/example-93.md
diff --git a/tests/markdown_spec/example-94.md b/tests/markdown/spec/example-94.md
similarity index 100%
rename from tests/markdown_spec/example-94.md
rename to tests/markdown/spec/example-94.md
diff --git a/tests/markdown_spec/example-95.md b/tests/markdown/spec/example-95.md
similarity index 100%
rename from tests/markdown_spec/example-95.md
rename to tests/markdown/spec/example-95.md
diff --git a/tests/markdown_spec/example-96.md b/tests/markdown/spec/example-96.md
similarity index 100%
rename from tests/markdown_spec/example-96.md
rename to tests/markdown/spec/example-96.md
diff --git a/tests/markdown_spec/example-97.md b/tests/markdown/spec/example-97.md
similarity index 100%
rename from tests/markdown_spec/example-97.md
rename to tests/markdown/spec/example-97.md
diff --git a/tests/markdown_spec/example-98.md b/tests/markdown/spec/example-98.md
similarity index 100%
rename from tests/markdown_spec/example-98.md
rename to tests/markdown/spec/example-98.md
diff --git a/tests/markdown_spec/example-99.md b/tests/markdown/spec/example-99.md
similarity index 100%
rename from tests/markdown_spec/example-99.md
rename to tests/markdown/spec/example-99.md
diff --git a/tests/markdown_spec/jsfmt.spec.js b/tests/markdown/spec/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_spec/jsfmt.spec.js
rename to tests/markdown/spec/jsfmt.spec.js
diff --git a/tests/markdown_spec/remark-bug/example-160.md b/tests/markdown/spec/remark-bug/example-160.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-160.md
rename to tests/markdown/spec/remark-bug/example-160.md
diff --git a/tests/markdown_spec/remark-bug/example-239.md b/tests/markdown/spec/remark-bug/example-239.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-239.md
rename to tests/markdown/spec/remark-bug/example-239.md
diff --git a/tests/markdown_spec/remark-bug/example-24.md b/tests/markdown/spec/remark-bug/example-24.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-24.md
rename to tests/markdown/spec/remark-bug/example-24.md
diff --git a/tests/markdown_spec/remark-bug/example-270.md b/tests/markdown/spec/remark-bug/example-270.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-270.md
rename to tests/markdown/spec/remark-bug/example-270.md
diff --git a/tests/markdown_spec/remark-bug/example-275.md b/tests/markdown/spec/remark-bug/example-275.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-275.md
rename to tests/markdown/spec/remark-bug/example-275.md
diff --git a/tests/markdown_spec/remark-bug/example-323.md b/tests/markdown/spec/remark-bug/example-323.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-323.md
rename to tests/markdown/spec/remark-bug/example-323.md
diff --git a/tests/markdown_spec/remark-bug/example-389.md b/tests/markdown/spec/remark-bug/example-389.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-389.md
rename to tests/markdown/spec/remark-bug/example-389.md
diff --git a/tests/markdown_spec/remark-bug/example-409.md b/tests/markdown/spec/remark-bug/example-409.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-409.md
rename to tests/markdown/spec/remark-bug/example-409.md
diff --git a/tests/markdown_spec/remark-bug/example-416.md b/tests/markdown/spec/remark-bug/example-416.md
similarity index 100%
rename from tests/markdown_spec/remark-bug/example-416.md
rename to tests/markdown/spec/remark-bug/example-416.md
diff --git a/tests/markdown_splitCjkText/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/splitCjkText/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_splitCjkText/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/splitCjkText/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_splitCjkText/chinese-japanese.md b/tests/markdown/splitCjkText/chinese-japanese.md
similarity index 100%
rename from tests/markdown_splitCjkText/chinese-japanese.md
rename to tests/markdown/splitCjkText/chinese-japanese.md
diff --git a/tests/markdown_splitCjkText/jsfmt.spec.js b/tests/markdown/splitCjkText/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_splitCjkText/jsfmt.spec.js
rename to tests/markdown/splitCjkText/jsfmt.spec.js
diff --git a/tests/markdown_splitCjkText/korean.md b/tests/markdown/splitCjkText/korean.md
similarity index 100%
rename from tests/markdown_splitCjkText/korean.md
rename to tests/markdown/splitCjkText/korean.md
diff --git a/tests/markdown_splitCjkText/link.md b/tests/markdown/splitCjkText/link.md
similarity index 100%
rename from tests/markdown_splitCjkText/link.md
rename to tests/markdown/splitCjkText/link.md
diff --git a/tests/markdown_splitCjkText/mixed.md b/tests/markdown/splitCjkText/mixed.md
similarity index 100%
rename from tests/markdown_splitCjkText/mixed.md
rename to tests/markdown/splitCjkText/mixed.md
diff --git a/tests/markdown_splitCjkText/space.md b/tests/markdown/splitCjkText/space.md
similarity index 100%
rename from tests/markdown_splitCjkText/space.md
rename to tests/markdown/splitCjkText/space.md
diff --git a/tests/markdown_strong/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/strong/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_strong/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/strong/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_strong/asterisk.md b/tests/markdown/strong/asterisk.md
similarity index 100%
rename from tests/markdown_strong/asterisk.md
rename to tests/markdown/strong/asterisk.md
diff --git a/tests/markdown_strong/jsfmt.spec.js b/tests/markdown/strong/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_strong/jsfmt.spec.js
rename to tests/markdown/strong/jsfmt.spec.js
diff --git a/tests/markdown_strong/underscore.md b/tests/markdown/strong/underscore.md
similarity index 100%
rename from tests/markdown_strong/underscore.md
rename to tests/markdown/strong/underscore.md
diff --git a/tests/markdown_table/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/table/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_table/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/table/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_table/align.md b/tests/markdown/table/align.md
similarity index 100%
rename from tests/markdown_table/align.md
rename to tests/markdown/table/align.md
diff --git a/tests/markdown_table/cjk.md b/tests/markdown/table/cjk.md
similarity index 100%
rename from tests/markdown_table/cjk.md
rename to tests/markdown/table/cjk.md
diff --git a/tests/markdown_table/emoji.md b/tests/markdown/table/emoji.md
similarity index 100%
rename from tests/markdown_table/emoji.md
rename to tests/markdown/table/emoji.md
diff --git a/tests/markdown_table/empty.md b/tests/markdown/table/empty.md
similarity index 100%
rename from tests/markdown_table/empty.md
rename to tests/markdown/table/empty.md
diff --git a/tests/markdown_table/escape.md b/tests/markdown/table/escape.md
similarity index 100%
rename from tests/markdown_table/escape.md
rename to tests/markdown/table/escape.md
diff --git a/tests/markdown_table/html.md b/tests/markdown/table/html.md
similarity index 100%
rename from tests/markdown_table/html.md
rename to tests/markdown/table/html.md
diff --git a/tests/markdown_table/jsfmt.spec.js b/tests/markdown/table/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_table/jsfmt.spec.js
rename to tests/markdown/table/jsfmt.spec.js
diff --git a/tests/markdown_table/simple.md b/tests/markdown/table/simple.md
similarity index 100%
rename from tests/markdown_table/simple.md
rename to tests/markdown/table/simple.md
diff --git a/tests/markdown_table/table.md b/tests/markdown/table/table.md
similarity index 100%
rename from tests/markdown_table/table.md
rename to tests/markdown/table/table.md
diff --git a/tests/markdown_thematicBreak/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/thematicBreak/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_thematicBreak/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/thematicBreak/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_thematicBreak/jsfmt.spec.js b/tests/markdown/thematicBreak/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_thematicBreak/jsfmt.spec.js
rename to tests/markdown/thematicBreak/jsfmt.spec.js
diff --git a/tests/markdown_thematicBreak/list.md b/tests/markdown/thematicBreak/list.md
similarity index 100%
rename from tests/markdown_thematicBreak/list.md
rename to tests/markdown/thematicBreak/list.md
diff --git a/tests/markdown_thematicBreak/simple.md b/tests/markdown/thematicBreak/simple.md
similarity index 100%
rename from tests/markdown_thematicBreak/simple.md
rename to tests/markdown/thematicBreak/simple.md
diff --git a/tests/markdown_toml/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/toml/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_toml/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/toml/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_toml/empty.md b/tests/markdown/toml/empty.md
similarity index 100%
rename from tests/markdown_toml/empty.md
rename to tests/markdown/toml/empty.md
diff --git a/tests/markdown_toml/jsfmt.spec.js b/tests/markdown/toml/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_toml/jsfmt.spec.js
rename to tests/markdown/toml/jsfmt.spec.js
diff --git a/tests/markdown_toml/simple.md b/tests/markdown/toml/simple.md
similarity index 100%
rename from tests/markdown_toml/simple.md
rename to tests/markdown/toml/simple.md
diff --git a/tests/markdown_word/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/word/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_word/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/word/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_word/escape.md b/tests/markdown/word/escape.md
similarity index 100%
rename from tests/markdown_word/escape.md
rename to tests/markdown/word/escape.md
diff --git a/tests/markdown_word/jsfmt.spec.js b/tests/markdown/word/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_word/jsfmt.spec.js
rename to tests/markdown/word/jsfmt.spec.js
diff --git a/tests/markdown_yaml/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/yaml/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/markdown_yaml/__snapshots__/jsfmt.spec.js.snap
rename to tests/markdown/yaml/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/markdown_yaml/complex.md b/tests/markdown/yaml/complex.md
similarity index 100%
rename from tests/markdown_yaml/complex.md
rename to tests/markdown/yaml/complex.md
diff --git a/tests/markdown_yaml/empty-2.md b/tests/markdown/yaml/empty-2.md
similarity index 100%
rename from tests/markdown_yaml/empty-2.md
rename to tests/markdown/yaml/empty-2.md
diff --git a/tests/markdown_yaml/empty.md b/tests/markdown/yaml/empty.md
similarity index 100%
rename from tests/markdown_yaml/empty.md
rename to tests/markdown/yaml/empty.md
diff --git a/tests/markdown_yaml/jsfmt.spec.js b/tests/markdown/yaml/jsfmt.spec.js
similarity index 100%
rename from tests/markdown_yaml/jsfmt.spec.js
rename to tests/markdown/yaml/jsfmt.spec.js
diff --git a/tests/markdown_yaml/simple-2.md b/tests/markdown/yaml/simple-2.md
similarity index 100%
rename from tests/markdown_yaml/simple-2.md
rename to tests/markdown/yaml/simple-2.md
diff --git a/tests/markdown_yaml/simple.md b/tests/markdown/yaml/simple.md
similarity index 100%
rename from tests/markdown_yaml/simple.md
rename to tests/markdown/yaml/simple.md
diff --git a/tests/markdown_yaml/trailing-spaces.md b/tests/markdown/yaml/trailing-spaces.md
similarity index 100%
rename from tests/markdown_yaml/trailing-spaces.md
rename to tests/markdown/yaml/trailing-spaces.md
diff --git a/tests/typescript_ambient/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/ambient/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_ambient/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/ambient/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_ambient/ambient.ts b/tests/typescript/ambient/ambient.ts
similarity index 100%
rename from tests/typescript_ambient/ambient.ts
rename to tests/typescript/ambient/ambient.ts
diff --git a/tests/typescript_ambient/jsfmt.spec.js b/tests/typescript/ambient/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_ambient/jsfmt.spec.js
rename to tests/typescript/ambient/jsfmt.spec.js
diff --git a/tests/typescript_argument_expansion/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/argument-expansion/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_argument_expansion/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/argument-expansion/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_argument_expansion/argument_expansion.js b/tests/typescript/argument-expansion/argument_expansion.js
similarity index 100%
rename from tests/typescript_argument_expansion/argument_expansion.js
rename to tests/typescript/argument-expansion/argument_expansion.js
diff --git a/tests/typescript_argument_expansion/jsfmt.spec.js b/tests/typescript/argument-expansion/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_argument_expansion/jsfmt.spec.js
rename to tests/typescript/argument-expansion/jsfmt.spec.js
diff --git a/tests/typescript_array/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/array/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_array/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/array/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_array/comment.js b/tests/typescript/array/comment.js
similarity index 100%
rename from tests/typescript_array/comment.js
rename to tests/typescript/array/comment.js
diff --git a/tests/typescript_array/jsfmt.spec.js b/tests/typescript/array/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_array/jsfmt.spec.js
rename to tests/typescript/array/jsfmt.spec.js
diff --git a/tests/typescript_array/key.ts b/tests/typescript/array/key.ts
similarity index 100%
rename from tests/typescript_array/key.ts
rename to tests/typescript/array/key.ts
diff --git a/tests/typescript_arrow/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/arrow/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_arrow/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/arrow/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_arrow/arrow_regression.js b/tests/typescript/arrow/arrow_regression.js
similarity index 100%
rename from tests/typescript_arrow/arrow_regression.js
rename to tests/typescript/arrow/arrow_regression.js
diff --git a/tests/typescript_arrow/comments.js b/tests/typescript/arrow/comments.js
similarity index 100%
rename from tests/typescript_arrow/comments.js
rename to tests/typescript/arrow/comments.js
diff --git a/tests/typescript_arrow/jsfmt.spec.js b/tests/typescript/arrow/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_arrow/jsfmt.spec.js
rename to tests/typescript/arrow/jsfmt.spec.js
diff --git a/tests/typescript_as/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/as/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_as/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/as/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_as/as.ts b/tests/typescript/as/as.ts
similarity index 100%
rename from tests/typescript_as/as.ts
rename to tests/typescript/as/as.ts
diff --git a/tests/typescript_as/assignment.ts b/tests/typescript/as/assignment.ts
similarity index 100%
rename from tests/typescript_as/assignment.ts
rename to tests/typescript/as/assignment.ts
diff --git a/tests/typescript_as/assignment2.ts b/tests/typescript/as/assignment2.ts
similarity index 100%
rename from tests/typescript_as/assignment2.ts
rename to tests/typescript/as/assignment2.ts
diff --git a/tests/typescript_as/export_default_as.ts b/tests/typescript/as/export_default_as.ts
similarity index 100%
rename from tests/typescript_as/export_default_as.ts
rename to tests/typescript/as/export_default_as.ts
diff --git a/tests/typescript_as/jsfmt.spec.js b/tests/typescript/as/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_as/jsfmt.spec.js
rename to tests/typescript/as/jsfmt.spec.js
diff --git a/tests/typescript_as/long-identifiers.ts b/tests/typescript/as/long-identifiers.ts
similarity index 100%
rename from tests/typescript_as/long-identifiers.ts
rename to tests/typescript/as/long-identifiers.ts
diff --git a/tests/typescript_as/return.ts b/tests/typescript/as/return.ts
similarity index 100%
rename from tests/typescript_as/return.ts
rename to tests/typescript/as/return.ts
diff --git a/tests/typescript_assert/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/assert/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_assert/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/assert/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_assert/index.ts b/tests/typescript/assert/index.ts
similarity index 100%
rename from tests/typescript_assert/index.ts
rename to tests/typescript/assert/index.ts
diff --git a/tests/typescript_assert/jsfmt.spec.js b/tests/typescript/assert/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_assert/jsfmt.spec.js
rename to tests/typescript/assert/jsfmt.spec.js
diff --git a/tests/typescript_bigint/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/bigint/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_bigint/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/bigint/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_bigint/bigint.ts b/tests/typescript/bigint/bigint.ts
similarity index 100%
rename from tests/typescript_bigint/bigint.ts
rename to tests/typescript/bigint/bigint.ts
diff --git a/tests/typescript_bigint/jsfmt.spec.js b/tests/typescript/bigint/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_bigint/jsfmt.spec.js
rename to tests/typescript/bigint/jsfmt.spec.js
diff --git a/tests/typescript_cast/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/cast/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_cast/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/cast/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_cast/as-const.ts b/tests/typescript/cast/as-const.ts
similarity index 100%
rename from tests/typescript_cast/as-const.ts
rename to tests/typescript/cast/as-const.ts
diff --git a/tests/typescript_cast/generic-cast.ts b/tests/typescript/cast/generic-cast.ts
similarity index 100%
rename from tests/typescript_cast/generic-cast.ts
rename to tests/typescript/cast/generic-cast.ts
diff --git a/tests/typescript_cast/hug-args.ts b/tests/typescript/cast/hug-args.ts
similarity index 100%
rename from tests/typescript_cast/hug-args.ts
rename to tests/typescript/cast/hug-args.ts
diff --git a/tests/typescript_cast/jsfmt.spec.js b/tests/typescript/cast/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_cast/jsfmt.spec.js
rename to tests/typescript/cast/jsfmt.spec.js
diff --git a/tests/typescript_cast/parenthesis.ts b/tests/typescript/cast/parenthesis.ts
similarity index 100%
rename from tests/typescript_cast/parenthesis.ts
rename to tests/typescript/cast/parenthesis.ts
diff --git a/tests/typescript_class/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/class/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_class/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/class/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_class/constructor.ts b/tests/typescript/class/constructor.ts
similarity index 100%
rename from tests/typescript_class/constructor.ts
rename to tests/typescript/class/constructor.ts
diff --git a/tests/typescript_class/dunder.ts b/tests/typescript/class/dunder.ts
similarity index 100%
rename from tests/typescript_class/dunder.ts
rename to tests/typescript/class/dunder.ts
diff --git a/tests/typescript_class/extends_implements.ts b/tests/typescript/class/extends_implements.ts
similarity index 100%
rename from tests/typescript_class/extends_implements.ts
rename to tests/typescript/class/extends_implements.ts
diff --git a/tests/typescript_class/generics.ts b/tests/typescript/class/generics.ts
similarity index 100%
rename from tests/typescript_class/generics.ts
rename to tests/typescript/class/generics.ts
diff --git a/tests/typescript_class/jsfmt.spec.js b/tests/typescript/class/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_class/jsfmt.spec.js
rename to tests/typescript/class/jsfmt.spec.js
diff --git a/tests/typescript_class/methods.ts b/tests/typescript/class/methods.ts
similarity index 100%
rename from tests/typescript_class/methods.ts
rename to tests/typescript/class/methods.ts
diff --git a/tests/typescript_class/optional.ts b/tests/typescript/class/optional.ts
similarity index 100%
rename from tests/typescript_class/optional.ts
rename to tests/typescript/class/optional.ts
diff --git a/tests/typescript_class/quoted-property.ts b/tests/typescript/class/quoted-property.ts
similarity index 100%
rename from tests/typescript_class/quoted-property.ts
rename to tests/typescript/class/quoted-property.ts
diff --git a/tests/typescript_class/standard_private_fields.ts b/tests/typescript/class/standard_private_fields.ts
similarity index 100%
rename from tests/typescript_class/standard_private_fields.ts
rename to tests/typescript/class/standard_private_fields.ts
diff --git a/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/comments/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/comments/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_comments/abstract_class.ts b/tests/typescript/comments/abstract_class.ts
similarity index 100%
rename from tests/typescript_comments/abstract_class.ts
rename to tests/typescript/comments/abstract_class.ts
diff --git a/tests/typescript_comments/after_jsx_generic.ts b/tests/typescript/comments/after_jsx_generic.ts
similarity index 100%
rename from tests/typescript_comments/after_jsx_generic.ts
rename to tests/typescript/comments/after_jsx_generic.ts
diff --git a/tests/typescript_comments/declare_function.ts b/tests/typescript/comments/declare_function.ts
similarity index 100%
rename from tests/typescript_comments/declare_function.ts
rename to tests/typescript/comments/declare_function.ts
diff --git a/tests/typescript_comments/interface.ts b/tests/typescript/comments/interface.ts
similarity index 100%
rename from tests/typescript_comments/interface.ts
rename to tests/typescript/comments/interface.ts
diff --git a/tests/typescript_comments/issues.ts b/tests/typescript/comments/issues.ts
similarity index 100%
rename from tests/typescript_comments/issues.ts
rename to tests/typescript/comments/issues.ts
diff --git a/tests/typescript_comments/jsfmt.spec.js b/tests/typescript/comments/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_comments/jsfmt.spec.js
rename to tests/typescript/comments/jsfmt.spec.js
diff --git a/tests/typescript_comments/jsx.ts b/tests/typescript/comments/jsx.ts
similarity index 100%
rename from tests/typescript_comments/jsx.ts
rename to tests/typescript/comments/jsx.ts
diff --git a/tests/typescript_comments/location.ts b/tests/typescript/comments/location.ts
similarity index 100%
rename from tests/typescript_comments/location.ts
rename to tests/typescript/comments/location.ts
diff --git a/tests/typescript_comments/mapped_types.ts b/tests/typescript/comments/mapped_types.ts
similarity index 100%
rename from tests/typescript_comments/mapped_types.ts
rename to tests/typescript/comments/mapped_types.ts
diff --git a/tests/typescript_comments/method_types.ts b/tests/typescript/comments/method_types.ts
similarity index 100%
rename from tests/typescript_comments/method_types.ts
rename to tests/typescript/comments/method_types.ts
diff --git a/tests/typescript_comments/methods.ts b/tests/typescript/comments/methods.ts
similarity index 100%
rename from tests/typescript_comments/methods.ts
rename to tests/typescript/comments/methods.ts
diff --git a/tests/typescript_comments/type-parameters.ts b/tests/typescript/comments/type-parameters.ts
similarity index 100%
rename from tests/typescript_comments/type-parameters.ts
rename to tests/typescript/comments/type-parameters.ts
diff --git a/tests/typescript_comments/types.ts b/tests/typescript/comments/types.ts
similarity index 100%
rename from tests/typescript_comments/types.ts
rename to tests/typescript/comments/types.ts
diff --git a/tests/typescript_comments/union.ts b/tests/typescript/comments/union.ts
similarity index 100%
rename from tests/typescript_comments/union.ts
rename to tests/typescript/comments/union.ts
diff --git a/tests/typescript_conditional_types/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/conditional-types/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_conditional_types/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/conditional-types/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_conditional_types/conditonal-types.ts b/tests/typescript/conditional-types/conditonal-types.ts
similarity index 100%
rename from tests/typescript_conditional_types/conditonal-types.ts
rename to tests/typescript/conditional-types/conditonal-types.ts
diff --git a/tests/typescript_conditional_types/infer-type.ts b/tests/typescript/conditional-types/infer-type.ts
similarity index 100%
rename from tests/typescript_conditional_types/infer-type.ts
rename to tests/typescript/conditional-types/infer-type.ts
diff --git a/tests/typescript_conditional_types/jsfmt.spec.js b/tests/typescript/conditional-types/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_conditional_types/jsfmt.spec.js
rename to tests/typescript/conditional-types/jsfmt.spec.js
diff --git a/tests/typescript_conditional_types/nested-in-condition.ts b/tests/typescript/conditional-types/nested-in-condition.ts
similarity index 100%
rename from tests/typescript_conditional_types/nested-in-condition.ts
rename to tests/typescript/conditional-types/nested-in-condition.ts
diff --git a/tests/typescript_declare/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/declare/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_declare/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/declare/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_declare/declare_class_fields.ts b/tests/typescript/declare/declare_class_fields.ts
similarity index 100%
rename from tests/typescript_declare/declare_class_fields.ts
rename to tests/typescript/declare/declare_class_fields.ts
diff --git a/tests/typescript_declare/declare_enum.ts b/tests/typescript/declare/declare_enum.ts
similarity index 100%
rename from tests/typescript_declare/declare_enum.ts
rename to tests/typescript/declare/declare_enum.ts
diff --git a/tests/typescript_declare/declare_function.ts b/tests/typescript/declare/declare_function.ts
similarity index 100%
rename from tests/typescript_declare/declare_function.ts
rename to tests/typescript/declare/declare_function.ts
diff --git a/tests/typescript_declare/declare_interface.ts b/tests/typescript/declare/declare_interface.ts
similarity index 100%
rename from tests/typescript_declare/declare_interface.ts
rename to tests/typescript/declare/declare_interface.ts
diff --git a/tests/typescript_declare/declare_var.ts b/tests/typescript/declare/declare_var.ts
similarity index 100%
rename from tests/typescript_declare/declare_var.ts
rename to tests/typescript/declare/declare_var.ts
diff --git a/tests/typescript_declare/jsfmt.spec.js b/tests/typescript/declare/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_declare/jsfmt.spec.js
rename to tests/typescript/declare/jsfmt.spec.js
diff --git a/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/decorators/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/decorators/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_decorators/argument-list-preserve-line.ts b/tests/typescript/decorators/argument-list-preserve-line.ts
similarity index 100%
rename from tests/typescript_decorators/argument-list-preserve-line.ts
rename to tests/typescript/decorators/argument-list-preserve-line.ts
diff --git a/tests/typescript_decorators/decorator-type-assertion.ts b/tests/typescript/decorators/decorator-type-assertion.ts
similarity index 100%
rename from tests/typescript_decorators/decorator-type-assertion.ts
rename to tests/typescript/decorators/decorator-type-assertion.ts
diff --git a/tests/typescript_decorators/decorators-comments.js b/tests/typescript/decorators/decorators-comments.js
similarity index 100%
rename from tests/typescript_decorators/decorators-comments.js
rename to tests/typescript/decorators/decorators-comments.js
diff --git a/tests/typescript_decorators/decorators.js b/tests/typescript/decorators/decorators.js
similarity index 100%
rename from tests/typescript_decorators/decorators.js
rename to tests/typescript/decorators/decorators.js
diff --git a/tests/typescript_decorators/inline-decorators.ts b/tests/typescript/decorators/inline-decorators.ts
similarity index 100%
rename from tests/typescript_decorators/inline-decorators.ts
rename to tests/typescript/decorators/inline-decorators.ts
diff --git a/tests/typescript_decorators/interface.ts b/tests/typescript/decorators/interface.ts
similarity index 100%
rename from tests/typescript_decorators/interface.ts
rename to tests/typescript/decorators/interface.ts
diff --git a/tests/typescript_decorators/jsfmt.spec.js b/tests/typescript/decorators/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_decorators/jsfmt.spec.js
rename to tests/typescript/decorators/jsfmt.spec.js
diff --git a/tests/typescript_definite/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/definite/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_definite/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/definite/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_definite/definite.ts b/tests/typescript/definite/definite.ts
similarity index 100%
rename from tests/typescript_definite/definite.ts
rename to tests/typescript/definite/definite.ts
diff --git a/tests/typescript_definite/jsfmt.spec.js b/tests/typescript/definite/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_definite/jsfmt.spec.js
rename to tests/typescript/definite/jsfmt.spec.js
diff --git a/tests/typescript_destructuring/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/destructuring/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_destructuring/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/destructuring/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_destructuring/destructuring.ts b/tests/typescript/destructuring/destructuring.ts
similarity index 100%
rename from tests/typescript_destructuring/destructuring.ts
rename to tests/typescript/destructuring/destructuring.ts
diff --git a/tests/typescript_destructuring/jsfmt.spec.js b/tests/typescript/destructuring/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_destructuring/jsfmt.spec.js
rename to tests/typescript/destructuring/jsfmt.spec.js
diff --git a/tests/typescript_enum/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/enum/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_enum/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/enum/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_enum/enum.ts b/tests/typescript/enum/enum.ts
similarity index 100%
rename from tests/typescript_enum/enum.ts
rename to tests/typescript/enum/enum.ts
diff --git a/tests/typescript_enum/jsfmt.spec.js b/tests/typescript/enum/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_enum/jsfmt.spec.js
rename to tests/typescript/enum/jsfmt.spec.js
diff --git a/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/error-recovery/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/error-recovery/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_error_recovery/generic.ts b/tests/typescript/error-recovery/generic.ts
similarity index 100%
rename from tests/typescript_error_recovery/generic.ts
rename to tests/typescript/error-recovery/generic.ts
diff --git a/tests/typescript_error_recovery/index-signature.ts b/tests/typescript/error-recovery/index-signature.ts
similarity index 100%
rename from tests/typescript_error_recovery/index-signature.ts
rename to tests/typescript/error-recovery/index-signature.ts
diff --git a/tests/typescript_error_recovery/jsdoc_only_types.ts b/tests/typescript/error-recovery/jsdoc_only_types.ts
similarity index 100%
rename from tests/typescript_error_recovery/jsdoc_only_types.ts
rename to tests/typescript/error-recovery/jsdoc_only_types.ts
diff --git a/tests/typescript_error_recovery/jsfmt.spec.js b/tests/typescript/error-recovery/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_error_recovery/jsfmt.spec.js
rename to tests/typescript/error-recovery/jsfmt.spec.js
diff --git a/tests/typescript_export/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/export/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_export/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/export/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_export/comment.js b/tests/typescript/export/comment.js
similarity index 100%
rename from tests/typescript_export/comment.js
rename to tests/typescript/export/comment.js
diff --git a/tests/typescript_export/default.js b/tests/typescript/export/default.js
similarity index 100%
rename from tests/typescript_export/default.js
rename to tests/typescript/export/default.js
diff --git a/tests/typescript_export/export-as-ns.ts b/tests/typescript/export/export-as-ns.ts
similarity index 100%
rename from tests/typescript_export/export-as-ns.ts
rename to tests/typescript/export/export-as-ns.ts
diff --git a/tests/typescript_export/export-class.js b/tests/typescript/export/export-class.js
similarity index 100%
rename from tests/typescript_export/export-class.js
rename to tests/typescript/export/export-class.js
diff --git a/tests/typescript_export/export.ts b/tests/typescript/export/export.ts
similarity index 100%
rename from tests/typescript_export/export.ts
rename to tests/typescript/export/export.ts
diff --git a/tests/typescript_export/jsfmt.spec.js b/tests/typescript/export/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_export/jsfmt.spec.js
rename to tests/typescript/export/jsfmt.spec.js
diff --git a/tests/typescript_function_type/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/function-type/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_function_type/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/function-type/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_function_type/jsfmt.spec.js b/tests/typescript/function-type/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_function_type/jsfmt.spec.js
rename to tests/typescript/function-type/jsfmt.spec.js
diff --git a/tests/typescript_function_type/single-parameter.ts b/tests/typescript/function-type/single-parameter.ts
similarity index 100%
rename from tests/typescript_function_type/single-parameter.ts
rename to tests/typescript/function-type/single-parameter.ts
diff --git a/tests/typescript_function_type/type-annotation.ts b/tests/typescript/function-type/type-annotation.ts
similarity index 100%
rename from tests/typescript_function_type/type-annotation.ts
rename to tests/typescript/function-type/type-annotation.ts
diff --git a/tests/typescript_generic/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/generic/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_generic/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/generic/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_generic/arrow-return-type.ts b/tests/typescript/generic/arrow-return-type.ts
similarity index 100%
rename from tests/typescript_generic/arrow-return-type.ts
rename to tests/typescript/generic/arrow-return-type.ts
diff --git a/tests/typescript_generic/jsfmt.spec.js b/tests/typescript/generic/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_generic/jsfmt.spec.js
rename to tests/typescript/generic/jsfmt.spec.js
diff --git a/tests/typescript_generic/object-method.ts b/tests/typescript/generic/object-method.ts
similarity index 100%
rename from tests/typescript_generic/object-method.ts
rename to tests/typescript/generic/object-method.ts
diff --git a/tests/typescript_import_export/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/import-export/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_import_export/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/import-export/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_import_export/jsfmt.spec.js b/tests/typescript/import-export/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_import_export/jsfmt.spec.js
rename to tests/typescript/import-export/jsfmt.spec.js
diff --git a/tests/typescript_import_export/type-modifier.ts b/tests/typescript/import-export/type-modifier.ts
similarity index 100%
rename from tests/typescript_import_export/type-modifier.ts
rename to tests/typescript/import-export/type-modifier.ts
diff --git a/tests/typescript_import_require/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/import-require/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_import_require/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/import-require/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_import_require/import_require.js b/tests/typescript/import-require/import_require.js
similarity index 100%
rename from tests/typescript_import_require/import_require.js
rename to tests/typescript/import-require/import_require.js
diff --git a/tests/typescript_import_require/jsfmt.spec.js b/tests/typescript/import-require/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_import_require/jsfmt.spec.js
rename to tests/typescript/import-require/jsfmt.spec.js
diff --git a/tests/typescript_import_type/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/import-type/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_import_type/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/import-type/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_import_type/import-type.ts b/tests/typescript/import-type/import-type.ts
similarity index 100%
rename from tests/typescript_import_type/import-type.ts
rename to tests/typescript/import-type/import-type.ts
diff --git a/tests/typescript_import_type/jsfmt.spec.js b/tests/typescript/import-type/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_import_type/jsfmt.spec.js
rename to tests/typescript/import-type/jsfmt.spec.js
diff --git a/tests/typescript_index_signature/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/index-signature/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_index_signature/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/index-signature/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_index_signature/index-signature.ts b/tests/typescript/index-signature/index-signature.ts
similarity index 100%
rename from tests/typescript_index_signature/index-signature.ts
rename to tests/typescript/index-signature/index-signature.ts
diff --git a/tests/typescript_index_signature/jsfmt.spec.js b/tests/typescript/index-signature/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_index_signature/jsfmt.spec.js
rename to tests/typescript/index-signature/jsfmt.spec.js
diff --git a/tests/typescript_interface/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/interface/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_interface/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/interface/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_interface/abstract.ts b/tests/typescript/interface/abstract.ts
similarity index 100%
rename from tests/typescript_interface/abstract.ts
rename to tests/typescript/interface/abstract.ts
diff --git a/tests/typescript_interface/comments.js b/tests/typescript/interface/comments.js
similarity index 100%
rename from tests/typescript_interface/comments.js
rename to tests/typescript/interface/comments.js
diff --git a/tests/typescript_interface/ignore.js b/tests/typescript/interface/ignore.js
similarity index 100%
rename from tests/typescript_interface/ignore.js
rename to tests/typescript/interface/ignore.js
diff --git a/tests/typescript_interface/jsfmt.spec.js b/tests/typescript/interface/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_interface/jsfmt.spec.js
rename to tests/typescript/interface/jsfmt.spec.js
diff --git a/tests/typescript_interface/long-extends.ts b/tests/typescript/interface/long-extends.ts
similarity index 100%
rename from tests/typescript_interface/long-extends.ts
rename to tests/typescript/interface/long-extends.ts
diff --git a/tests/typescript_interface/separator.ts b/tests/typescript/interface/separator.ts
similarity index 100%
rename from tests/typescript_interface/separator.ts
rename to tests/typescript/interface/separator.ts
diff --git a/tests/typescript_intersection/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/intersection/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_intersection/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/intersection/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_intersection/intersection-parens.ts b/tests/typescript/intersection/intersection-parens.ts
similarity index 100%
rename from tests/typescript_intersection/intersection-parens.ts
rename to tests/typescript/intersection/intersection-parens.ts
diff --git a/tests/typescript_intersection/jsfmt.spec.js b/tests/typescript/intersection/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_intersection/jsfmt.spec.js
rename to tests/typescript/intersection/jsfmt.spec.js
diff --git a/tests/typescript_keyof/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/keyof/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_keyof/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/keyof/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_keyof/jsfmt.spec.js b/tests/typescript/keyof/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_keyof/jsfmt.spec.js
rename to tests/typescript/keyof/jsfmt.spec.js
diff --git a/tests/typescript_keyof/keyof.ts b/tests/typescript/keyof/keyof.ts
similarity index 100%
rename from tests/typescript_keyof/keyof.ts
rename to tests/typescript/keyof/keyof.ts
diff --git a/tests/typescript_keywords/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/keywords/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_keywords/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/keywords/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_keywords/jsfmt.spec.js b/tests/typescript/keywords/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_keywords/jsfmt.spec.js
rename to tests/typescript/keywords/jsfmt.spec.js
diff --git a/tests/typescript_keywords/keywords.js b/tests/typescript/keywords/keywords.js
similarity index 100%
rename from tests/typescript_keywords/keywords.js
rename to tests/typescript/keywords/keywords.js
diff --git a/tests/typescript_mapped_type/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/mapped-type/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_mapped_type/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/mapped-type/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_mapped_type/jsfmt.spec.js b/tests/typescript/mapped-type/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_mapped_type/jsfmt.spec.js
rename to tests/typescript/mapped-type/jsfmt.spec.js
diff --git a/tests/typescript_mapped_type/mapped-type.ts b/tests/typescript/mapped-type/mapped-type.ts
similarity index 100%
rename from tests/typescript_mapped_type/mapped-type.ts
rename to tests/typescript/mapped-type/mapped-type.ts
diff --git a/tests/typescript_method/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/method/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_method/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/method/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_method/jsfmt.spec.js b/tests/typescript/method/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_method/jsfmt.spec.js
rename to tests/typescript/method/jsfmt.spec.js
diff --git a/tests/typescript_method/semi.js b/tests/typescript/method/semi.js
similarity index 100%
rename from tests/typescript_method/semi.js
rename to tests/typescript/method/semi.js
diff --git a/tests/typescript_method/type_literal_optional_method.ts b/tests/typescript/method/type_literal_optional_method.ts
similarity index 100%
rename from tests/typescript_method/type_literal_optional_method.ts
rename to tests/typescript/method/type_literal_optional_method.ts
diff --git a/tests/typescript_module/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/module/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_module/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/module/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_module/empty.js b/tests/typescript/module/empty.js
similarity index 100%
rename from tests/typescript_module/empty.js
rename to tests/typescript/module/empty.js
diff --git a/tests/typescript_module/global.js b/tests/typescript/module/global.js
similarity index 100%
rename from tests/typescript_module/global.js
rename to tests/typescript/module/global.js
diff --git a/tests/typescript_module/jsfmt.spec.js b/tests/typescript/module/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_module/jsfmt.spec.js
rename to tests/typescript/module/jsfmt.spec.js
diff --git a/tests/typescript_module/keyword.ts b/tests/typescript/module/keyword.ts
similarity index 100%
rename from tests/typescript_module/keyword.ts
rename to tests/typescript/module/keyword.ts
diff --git a/tests/typescript_module/namespace_function.ts b/tests/typescript/module/namespace_function.ts
similarity index 100%
rename from tests/typescript_module/namespace_function.ts
rename to tests/typescript/module/namespace_function.ts
diff --git a/tests/typescript_never/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/never/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_never/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/never/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_never/jsfmt.spec.js b/tests/typescript/never/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_never/jsfmt.spec.js
rename to tests/typescript/never/jsfmt.spec.js
diff --git a/tests/typescript_never/type-argument.src.ts b/tests/typescript/never/type-argument.src.ts
similarity index 100%
rename from tests/typescript_never/type-argument.src.ts
rename to tests/typescript/never/type-argument.src.ts
diff --git a/tests/typescript_new/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/new/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_new/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/new/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_new/jsfmt.spec.js b/tests/typescript/new/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_new/jsfmt.spec.js
rename to tests/typescript/new/jsfmt.spec.js
diff --git a/tests/typescript_new/new-signature.ts b/tests/typescript/new/new-signature.ts
similarity index 100%
rename from tests/typescript_new/new-signature.ts
rename to tests/typescript/new/new-signature.ts
diff --git a/tests/typescript_non_null/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/non-null/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_non_null/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/non-null/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_non_null/jsfmt.spec.js b/tests/typescript/non-null/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_non_null/jsfmt.spec.js
rename to tests/typescript/non-null/jsfmt.spec.js
diff --git a/tests/typescript_non_null/member-chain.js b/tests/typescript/non-null/member-chain.js
similarity index 100%
rename from tests/typescript_non_null/member-chain.js
rename to tests/typescript/non-null/member-chain.js
diff --git a/tests/typescript_non_null/parens.ts b/tests/typescript/non-null/parens.ts
similarity index 100%
rename from tests/typescript_non_null/parens.ts
rename to tests/typescript/non-null/parens.ts
diff --git a/tests/typescript_nosemi/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/nosemi/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_nosemi/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/nosemi/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_nosemi/index-signature.ts b/tests/typescript/nosemi/index-signature.ts
similarity index 100%
rename from tests/typescript_nosemi/index-signature.ts
rename to tests/typescript/nosemi/index-signature.ts
diff --git a/tests/typescript_nosemi/interface.ts b/tests/typescript/nosemi/interface.ts
similarity index 100%
rename from tests/typescript_nosemi/interface.ts
rename to tests/typescript/nosemi/interface.ts
diff --git a/tests/typescript_nosemi/jsfmt.spec.js b/tests/typescript/nosemi/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_nosemi/jsfmt.spec.js
rename to tests/typescript/nosemi/jsfmt.spec.js
diff --git a/tests/typescript_nosemi/type.js b/tests/typescript/nosemi/type.js
similarity index 100%
rename from tests/typescript_nosemi/type.js
rename to tests/typescript/nosemi/type.js
diff --git a/tests/typescript_optional_type/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/optional-type/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_optional_type/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/optional-type/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_optional_type/complex.ts b/tests/typescript/optional-type/complex.ts
similarity index 100%
rename from tests/typescript_optional_type/complex.ts
rename to tests/typescript/optional-type/complex.ts
diff --git a/tests/typescript_optional_type/jsfmt.spec.js b/tests/typescript/optional-type/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_optional_type/jsfmt.spec.js
rename to tests/typescript/optional-type/jsfmt.spec.js
diff --git a/tests/typescript_optional_type/simple.ts b/tests/typescript/optional-type/simple.ts
similarity index 100%
rename from tests/typescript_optional_type/simple.ts
rename to tests/typescript/optional-type/simple.ts
diff --git a/tests/typescript_readonly/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/readonly/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_readonly/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/readonly/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_readonly/array.ts b/tests/typescript/readonly/array.ts
similarity index 100%
rename from tests/typescript_readonly/array.ts
rename to tests/typescript/readonly/array.ts
diff --git a/tests/typescript_readonly/jsfmt.spec.js b/tests/typescript/readonly/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_readonly/jsfmt.spec.js
rename to tests/typescript/readonly/jsfmt.spec.js
diff --git a/tests/typescript_readonly/readonly.ts b/tests/typescript/readonly/readonly.ts
similarity index 100%
rename from tests/typescript_readonly/readonly.ts
rename to tests/typescript/readonly/readonly.ts
diff --git a/tests/typescript_rest_type/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/rest-type/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_rest_type/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/rest-type/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_rest_type/complex.ts b/tests/typescript/rest-type/complex.ts
similarity index 100%
rename from tests/typescript_rest_type/complex.ts
rename to tests/typescript/rest-type/complex.ts
diff --git a/tests/typescript_rest/jsfmt.spec.js b/tests/typescript/rest-type/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_rest/jsfmt.spec.js
rename to tests/typescript/rest-type/jsfmt.spec.js
diff --git a/tests/typescript_rest_type/simple.ts b/tests/typescript/rest-type/simple.ts
similarity index 100%
rename from tests/typescript_rest_type/simple.ts
rename to tests/typescript/rest-type/simple.ts
diff --git a/tests/typescript_rest/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/rest/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_rest/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/rest/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_rest_type/jsfmt.spec.js b/tests/typescript/rest/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_rest_type/jsfmt.spec.js
rename to tests/typescript/rest/jsfmt.spec.js
diff --git a/tests/typescript_rest/rest.ts b/tests/typescript/rest/rest.ts
similarity index 100%
rename from tests/typescript_rest/rest.ts
rename to tests/typescript/rest/rest.ts
diff --git a/tests/typescript_semi/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/semi/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_semi/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/semi/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_semi/jsfmt.spec.js b/tests/typescript/semi/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_semi/jsfmt.spec.js
rename to tests/typescript/semi/jsfmt.spec.js
diff --git a/tests/typescript_semi/no-semi.ts b/tests/typescript/semi/no-semi.ts
similarity index 100%
rename from tests/typescript_semi/no-semi.ts
rename to tests/typescript/semi/no-semi.ts
diff --git a/tests/typescript_symbol/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/symbol/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_symbol/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/symbol/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_symbol/jsfmt.spec.js b/tests/typescript/symbol/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_symbol/jsfmt.spec.js
rename to tests/typescript/symbol/jsfmt.spec.js
diff --git a/tests/typescript_symbol/symbol.ts b/tests/typescript/symbol/symbol.ts
similarity index 100%
rename from tests/typescript_symbol/symbol.ts
rename to tests/typescript/symbol/symbol.ts
diff --git a/tests/typescript_template_literals/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/template-literals/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_template_literals/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/template-literals/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_template_literals/as-expression.ts b/tests/typescript/template-literals/as-expression.ts
similarity index 100%
rename from tests/typescript_template_literals/as-expression.ts
rename to tests/typescript/template-literals/as-expression.ts
diff --git a/tests/typescript_template_literals/jsfmt.spec.js b/tests/typescript/template-literals/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_template_literals/jsfmt.spec.js
rename to tests/typescript/template-literals/jsfmt.spec.js
diff --git a/tests/typescript_trailing_comma/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/trailing-comma/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_trailing_comma/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/trailing-comma/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_trailing_comma/jsfmt.spec.js b/tests/typescript/trailing-comma/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_trailing_comma/jsfmt.spec.js
rename to tests/typescript/trailing-comma/jsfmt.spec.js
diff --git a/tests/typescript_trailing_comma/trailing.ts b/tests/typescript/trailing-comma/trailing.ts
similarity index 100%
rename from tests/typescript_trailing_comma/trailing.ts
rename to tests/typescript/trailing-comma/trailing.ts
diff --git a/tests/typescript_tsx/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/tsx/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_tsx/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/tsx/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_tsx/generic-component.tsx b/tests/typescript/tsx/generic-component.tsx
similarity index 100%
rename from tests/typescript_tsx/generic-component.tsx
rename to tests/typescript/tsx/generic-component.tsx
diff --git a/tests/typescript_tsx/jsfmt.spec.js b/tests/typescript/tsx/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_tsx/jsfmt.spec.js
rename to tests/typescript/tsx/jsfmt.spec.js
diff --git a/tests/typescript_tsx/keyword.tsx b/tests/typescript/tsx/keyword.tsx
similarity index 100%
rename from tests/typescript_tsx/keyword.tsx
rename to tests/typescript/tsx/keyword.tsx
diff --git a/tests/typescript_tsx/member-expression.tsx b/tests/typescript/tsx/member-expression.tsx
similarity index 100%
rename from tests/typescript_tsx/member-expression.tsx
rename to tests/typescript/tsx/member-expression.tsx
diff --git a/tests/typescript_tsx/not-react.ts b/tests/typescript/tsx/not-react.ts
similarity index 100%
rename from tests/typescript_tsx/not-react.ts
rename to tests/typescript/tsx/not-react.ts
diff --git a/tests/typescript_tsx/react.tsx b/tests/typescript/tsx/react.tsx
similarity index 100%
rename from tests/typescript_tsx/react.tsx
rename to tests/typescript/tsx/react.tsx
diff --git a/tests/typescript_tsx/this.tsx b/tests/typescript/tsx/this.tsx
similarity index 100%
rename from tests/typescript_tsx/this.tsx
rename to tests/typescript/tsx/this.tsx
diff --git a/tests/typescript_tsx/type-parameters.tsx b/tests/typescript/tsx/type-parameters.tsx
similarity index 100%
rename from tests/typescript_tsx/type-parameters.tsx
rename to tests/typescript/tsx/type-parameters.tsx
diff --git a/tests/typescript_tsx/url.tsx b/tests/typescript/tsx/url.tsx
similarity index 100%
rename from tests/typescript_tsx/url.tsx
rename to tests/typescript/tsx/url.tsx
diff --git a/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/tuple/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/tuple/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_tuple/jsfmt.spec.js b/tests/typescript/tuple/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_tuple/jsfmt.spec.js
rename to tests/typescript/tuple/jsfmt.spec.js
diff --git a/tests/typescript_tuple/no-trailing-comma-after-rest.ts b/tests/typescript/tuple/no-trailing-comma-after-rest.ts
similarity index 100%
rename from tests/typescript_tuple/no-trailing-comma-after-rest.ts
rename to tests/typescript/tuple/no-trailing-comma-after-rest.ts
diff --git a/tests/typescript_tuple/trailing-comma.ts b/tests/typescript/tuple/trailing-comma.ts
similarity index 100%
rename from tests/typescript_tuple/trailing-comma.ts
rename to tests/typescript/tuple/trailing-comma.ts
diff --git a/tests/typescript_tuple/tuple.ts b/tests/typescript/tuple/tuple.ts
similarity index 100%
rename from tests/typescript_tuple/tuple.ts
rename to tests/typescript/tuple/tuple.ts
diff --git a/tests/typescript_typeparams/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/typeparams/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_typeparams/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/typeparams/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_typeparams/class-method.ts b/tests/typescript/typeparams/class-method.ts
similarity index 100%
rename from tests/typescript_typeparams/class-method.ts
rename to tests/typescript/typeparams/class-method.ts
diff --git a/tests/typescript_typeparams/jsfmt.spec.js b/tests/typescript/typeparams/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_typeparams/jsfmt.spec.js
rename to tests/typescript/typeparams/jsfmt.spec.js
diff --git a/tests/typescript_typeparams/long-function-arg.ts b/tests/typescript/typeparams/long-function-arg.ts
similarity index 100%
rename from tests/typescript_typeparams/long-function-arg.ts
rename to tests/typescript/typeparams/long-function-arg.ts
diff --git a/tests/typescript_typeparams/tagged-template-expression.ts b/tests/typescript/typeparams/tagged-template-expression.ts
similarity index 100%
rename from tests/typescript_typeparams/tagged-template-expression.ts
rename to tests/typescript/typeparams/tagged-template-expression.ts
diff --git a/tests/typescript_union/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/union/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_union/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/union/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_union/inlining.ts b/tests/typescript/union/inlining.ts
similarity index 100%
rename from tests/typescript_union/inlining.ts
rename to tests/typescript/union/inlining.ts
diff --git a/tests/typescript_union/jsfmt.spec.js b/tests/typescript/union/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_union/jsfmt.spec.js
rename to tests/typescript/union/jsfmt.spec.js
diff --git a/tests/typescript_union/prettier-ignore-nested-unions.ts b/tests/typescript/union/prettier-ignore-nested-unions.ts
similarity index 100%
rename from tests/typescript_union/prettier-ignore-nested-unions.ts
rename to tests/typescript/union/prettier-ignore-nested-unions.ts
diff --git a/tests/typescript_union/prettier-ignore.ts b/tests/typescript/union/prettier-ignore.ts
similarity index 100%
rename from tests/typescript_union/prettier-ignore.ts
rename to tests/typescript/union/prettier-ignore.ts
diff --git a/tests/typescript_union/union-parens.ts b/tests/typescript/union/union-parens.ts
similarity index 100%
rename from tests/typescript_union/union-parens.ts
rename to tests/typescript/union/union-parens.ts
diff --git a/tests/typescript_union/with-type-params.ts b/tests/typescript/union/with-type-params.ts
similarity index 100%
rename from tests/typescript_union/with-type-params.ts
rename to tests/typescript/union/with-type-params.ts
diff --git a/tests/typescript_union/within-tuple.ts b/tests/typescript/union/within-tuple.ts
similarity index 100%
rename from tests/typescript_union/within-tuple.ts
rename to tests/typescript/union/within-tuple.ts
diff --git a/tests/typescript_unique_symbol/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/unique-symbol/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_unique_symbol/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/unique-symbol/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_unique_symbol/jsfmt.spec.js b/tests/typescript/unique-symbol/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_unique_symbol/jsfmt.spec.js
rename to tests/typescript/unique-symbol/jsfmt.spec.js
diff --git a/tests/typescript_unique_symbol/unique-symbol.ts b/tests/typescript/unique-symbol/unique-symbol.ts
similarity index 100%
rename from tests/typescript_unique_symbol/unique-symbol.ts
rename to tests/typescript/unique-symbol/unique-symbol.ts
diff --git a/tests/typescript_unknown/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/unknown/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/typescript_unknown/__snapshots__/jsfmt.spec.js.snap
rename to tests/typescript/unknown/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/typescript_unknown/jsfmt.spec.js b/tests/typescript/unknown/jsfmt.spec.js
similarity index 100%
rename from tests/typescript_unknown/jsfmt.spec.js
rename to tests/typescript/unknown/jsfmt.spec.js
diff --git a/tests/typescript_unknown/unknown.ts b/tests/typescript/unknown/unknown.ts
similarity index 100%
rename from tests/typescript_unknown/unknown.ts
rename to tests/typescript/unknown/unknown.ts
diff --git a/tests/yaml_alias/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/alias/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_alias/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/alias/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_alias/common.yml b/tests/yaml/alias/common.yml
similarity index 100%
rename from tests/yaml_alias/common.yml
rename to tests/yaml/alias/common.yml
diff --git a/tests/yaml_alias/jsfmt.spec.js b/tests/yaml/alias/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_alias/jsfmt.spec.js
rename to tests/yaml/alias/jsfmt.spec.js
diff --git a/tests/yaml_ansible/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/ansible/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_ansible/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/ansible/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_ansible/jsfmt.spec.js b/tests/yaml/ansible/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_ansible/jsfmt.spec.js
rename to tests/yaml/ansible/jsfmt.spec.js
diff --git a/tests/yaml_ansible/playbook.yml b/tests/yaml/ansible/playbook.yml
similarity index 100%
rename from tests/yaml_ansible/playbook.yml
rename to tests/yaml/ansible/playbook.yml
diff --git a/tests/yaml_block_folded/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/block-folded/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_block_folded/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/block-folded/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_block_folded/clip.yml b/tests/yaml/block-folded/clip.yml
similarity index 100%
rename from tests/yaml_block_folded/clip.yml
rename to tests/yaml/block-folded/clip.yml
diff --git a/tests/yaml_block_folded/indent.yml b/tests/yaml/block-folded/indent.yml
similarity index 100%
rename from tests/yaml_block_folded/indent.yml
rename to tests/yaml/block-folded/indent.yml
diff --git a/tests/yaml_block_folded/jsfmt.spec.js b/tests/yaml/block-folded/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_block_folded/jsfmt.spec.js
rename to tests/yaml/block-folded/jsfmt.spec.js
diff --git a/tests/yaml_block_folded/keep.yml b/tests/yaml/block-folded/keep.yml
similarity index 100%
rename from tests/yaml_block_folded/keep.yml
rename to tests/yaml/block-folded/keep.yml
diff --git a/tests/yaml_block_folded/map.yml b/tests/yaml/block-folded/map.yml
similarity index 100%
rename from tests/yaml_block_folded/map.yml
rename to tests/yaml/block-folded/map.yml
diff --git a/tests/yaml_block_folded/middle-comment.yml b/tests/yaml/block-folded/middle-comment.yml
similarity index 100%
rename from tests/yaml_block_folded/middle-comment.yml
rename to tests/yaml/block-folded/middle-comment.yml
diff --git a/tests/yaml_block_folded/middle-comments.yml b/tests/yaml/block-folded/middle-comments.yml
similarity index 100%
rename from tests/yaml_block_folded/middle-comments.yml
rename to tests/yaml/block-folded/middle-comments.yml
diff --git a/tests/yaml_block_folded/newline-unaligned.yml b/tests/yaml/block-folded/newline-unaligned.yml
similarity index 100%
rename from tests/yaml_block_folded/newline-unaligned.yml
rename to tests/yaml/block-folded/newline-unaligned.yml
diff --git a/tests/yaml_block_folded/newline.yml b/tests/yaml/block-folded/newline.yml
similarity index 100%
rename from tests/yaml_block_folded/newline.yml
rename to tests/yaml/block-folded/newline.yml
diff --git a/tests/yaml_block_folded/props-in-map.yml b/tests/yaml/block-folded/props-in-map.yml
similarity index 100%
rename from tests/yaml_block_folded/props-in-map.yml
rename to tests/yaml/block-folded/props-in-map.yml
diff --git a/tests/yaml_block_folded/props.yml b/tests/yaml/block-folded/props.yml
similarity index 100%
rename from tests/yaml_block_folded/props.yml
rename to tests/yaml/block-folded/props.yml
diff --git a/tests/yaml_block_folded/prose.yml b/tests/yaml/block-folded/prose.yml
similarity index 100%
rename from tests/yaml_block_folded/prose.yml
rename to tests/yaml/block-folded/prose.yml
diff --git a/tests/yaml_block_folded/seq.yml b/tests/yaml/block-folded/seq.yml
similarity index 100%
rename from tests/yaml_block_folded/seq.yml
rename to tests/yaml/block-folded/seq.yml
diff --git a/tests/yaml_block_folded/strip.yml b/tests/yaml/block-folded/strip.yml
similarity index 100%
rename from tests/yaml_block_folded/strip.yml
rename to tests/yaml/block-folded/strip.yml
diff --git a/tests/yaml_block_folded/trailing-comment.yml b/tests/yaml/block-folded/trailing-comment.yml
similarity index 100%
rename from tests/yaml_block_folded/trailing-comment.yml
rename to tests/yaml/block-folded/trailing-comment.yml
diff --git a/tests/yaml_block_literal/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/block-literal/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_block_literal/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/block-literal/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_block_literal/clip.yml b/tests/yaml/block-literal/clip.yml
similarity index 100%
rename from tests/yaml_block_literal/clip.yml
rename to tests/yaml/block-literal/clip.yml
diff --git a/tests/yaml_block_literal/indent.yml b/tests/yaml/block-literal/indent.yml
similarity index 100%
rename from tests/yaml_block_literal/indent.yml
rename to tests/yaml/block-literal/indent.yml
diff --git a/tests/yaml_block_literal/jsfmt.spec.js b/tests/yaml/block-literal/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_block_literal/jsfmt.spec.js
rename to tests/yaml/block-literal/jsfmt.spec.js
diff --git a/tests/yaml_block_literal/keep.yml b/tests/yaml/block-literal/keep.yml
similarity index 100%
rename from tests/yaml_block_literal/keep.yml
rename to tests/yaml/block-literal/keep.yml
diff --git a/tests/yaml_block_literal/map.yml b/tests/yaml/block-literal/map.yml
similarity index 100%
rename from tests/yaml_block_literal/map.yml
rename to tests/yaml/block-literal/map.yml
diff --git a/tests/yaml_block_literal/middle-comment.yml b/tests/yaml/block-literal/middle-comment.yml
similarity index 100%
rename from tests/yaml_block_literal/middle-comment.yml
rename to tests/yaml/block-literal/middle-comment.yml
diff --git a/tests/yaml_block_literal/middle-comments.yml b/tests/yaml/block-literal/middle-comments.yml
similarity index 100%
rename from tests/yaml_block_literal/middle-comments.yml
rename to tests/yaml/block-literal/middle-comments.yml
diff --git a/tests/yaml_block_literal/newline-unaligned.yml b/tests/yaml/block-literal/newline-unaligned.yml
similarity index 100%
rename from tests/yaml_block_literal/newline-unaligned.yml
rename to tests/yaml/block-literal/newline-unaligned.yml
diff --git a/tests/yaml_block_literal/newline.yml b/tests/yaml/block-literal/newline.yml
similarity index 100%
rename from tests/yaml_block_literal/newline.yml
rename to tests/yaml/block-literal/newline.yml
diff --git a/tests/yaml_block_literal/props-in-map.yml b/tests/yaml/block-literal/props-in-map.yml
similarity index 100%
rename from tests/yaml_block_literal/props-in-map.yml
rename to tests/yaml/block-literal/props-in-map.yml
diff --git a/tests/yaml_block_literal/props.yml b/tests/yaml/block-literal/props.yml
similarity index 100%
rename from tests/yaml_block_literal/props.yml
rename to tests/yaml/block-literal/props.yml
diff --git a/tests/yaml_block_literal/seq.yml b/tests/yaml/block-literal/seq.yml
similarity index 100%
rename from tests/yaml_block_literal/seq.yml
rename to tests/yaml/block-literal/seq.yml
diff --git a/tests/yaml_block_literal/strip.yml b/tests/yaml/block-literal/strip.yml
similarity index 100%
rename from tests/yaml_block_literal/strip.yml
rename to tests/yaml/block-literal/strip.yml
diff --git a/tests/yaml_block_literal/trailing-comment.yml b/tests/yaml/block-literal/trailing-comment.yml
similarity index 100%
rename from tests/yaml_block_literal/trailing-comment.yml
rename to tests/yaml/block-literal/trailing-comment.yml
diff --git a/tests/yaml_comment/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/comment/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_comment/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/comment/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_comment/collection.yml b/tests/yaml/comment/collection.yml
similarity index 100%
rename from tests/yaml_comment/collection.yml
rename to tests/yaml/comment/collection.yml
diff --git a/tests/yaml_comment/end-comment.yml b/tests/yaml/comment/end-comment.yml
similarity index 100%
rename from tests/yaml_comment/end-comment.yml
rename to tests/yaml/comment/end-comment.yml
diff --git a/tests/yaml_comment/in-empty-item-without-newlline.yml b/tests/yaml/comment/in-empty-item-without-newlline.yml
similarity index 100%
rename from tests/yaml_comment/in-empty-item-without-newlline.yml
rename to tests/yaml/comment/in-empty-item-without-newlline.yml
diff --git a/tests/yaml_comment/jsfmt.spec.js b/tests/yaml/comment/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_comment/jsfmt.spec.js
rename to tests/yaml/comment/jsfmt.spec.js
diff --git a/tests/yaml_comment/root.yml b/tests/yaml/comment/root.yml
similarity index 100%
rename from tests/yaml_comment/root.yml
rename to tests/yaml/comment/root.yml
diff --git a/tests/yaml_comment/set.yml b/tests/yaml/comment/set.yml
similarity index 100%
rename from tests/yaml_comment/set.yml
rename to tests/yaml/comment/set.yml
diff --git a/tests/yaml_directive/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/directive/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_directive/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/directive/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_directive/jsfmt.spec.js b/tests/yaml/directive/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_directive/jsfmt.spec.js
rename to tests/yaml/directive/jsfmt.spec.js
diff --git a/tests/yaml_directive/with-parameters.yml b/tests/yaml/directive/with-parameters.yml
similarity index 100%
rename from tests/yaml_directive/with-parameters.yml
rename to tests/yaml/directive/with-parameters.yml
diff --git a/tests/yaml_directive/without-parameters.yml b/tests/yaml/directive/without-parameters.yml
similarity index 100%
rename from tests/yaml_directive/without-parameters.yml
rename to tests/yaml/directive/without-parameters.yml
diff --git a/tests/yaml_document/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/document/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_document/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/document/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_document/directives-and-comments.yml b/tests/yaml/document/directives-and-comments.yml
similarity index 100%
rename from tests/yaml_document/directives-and-comments.yml
rename to tests/yaml/document/directives-and-comments.yml
diff --git a/tests/yaml_document/jsfmt.spec.js b/tests/yaml/document/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_document/jsfmt.spec.js
rename to tests/yaml/document/jsfmt.spec.js
diff --git a/tests/yaml_document/separator.yml b/tests/yaml/document/separator.yml
similarity index 100%
rename from tests/yaml_document/separator.yml
rename to tests/yaml/document/separator.yml
diff --git a/tests/yaml_document/with-document-head-like.yml b/tests/yaml/document/with-document-head-like.yml
similarity index 100%
rename from tests/yaml_document/with-document-head-like.yml
rename to tests/yaml/document/with-document-head-like.yml
diff --git a/tests/yaml_document/with-document-head.yml b/tests/yaml/document/with-document-head.yml
similarity index 100%
rename from tests/yaml_document/with-document-head.yml
rename to tests/yaml/document/with-document-head.yml
diff --git a/tests/yaml_document/without-document-head.yml b/tests/yaml/document/without-document-head.yml
similarity index 100%
rename from tests/yaml_document/without-document-head.yml
rename to tests/yaml/document/without-document-head.yml
diff --git a/tests/yaml_flow_mapping/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/flow-mapping/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_flow_mapping/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/flow-mapping/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_flow_mapping/alias-key.yml b/tests/yaml/flow-mapping/alias-key.yml
similarity index 100%
rename from tests/yaml_flow_mapping/alias-key.yml
rename to tests/yaml/flow-mapping/alias-key.yml
diff --git a/tests/yaml_flow_mapping/array-key-array-value.yml b/tests/yaml/flow-mapping/array-key-array-value.yml
similarity index 100%
rename from tests/yaml_flow_mapping/array-key-array-value.yml
rename to tests/yaml/flow-mapping/array-key-array-value.yml
diff --git a/tests/yaml_flow_mapping/array-key.yml b/tests/yaml/flow-mapping/array-key.yml
similarity index 100%
rename from tests/yaml_flow_mapping/array-key.yml
rename to tests/yaml/flow-mapping/array-key.yml
diff --git a/tests/yaml_flow_mapping/array-plain.yml b/tests/yaml/flow-mapping/array-plain.yml
similarity index 100%
rename from tests/yaml_flow_mapping/array-plain.yml
rename to tests/yaml/flow-mapping/array-plain.yml
diff --git a/tests/yaml_flow_mapping/array-value.yml b/tests/yaml/flow-mapping/array-value.yml
similarity index 100%
rename from tests/yaml_flow_mapping/array-value.yml
rename to tests/yaml/flow-mapping/array-value.yml
diff --git a/tests/yaml_flow_mapping/comment-between.yml b/tests/yaml/flow-mapping/comment-between.yml
similarity index 100%
rename from tests/yaml_flow_mapping/comment-between.yml
rename to tests/yaml/flow-mapping/comment-between.yml
diff --git a/tests/yaml_flow_mapping/comment-trailing.yml b/tests/yaml/flow-mapping/comment-trailing.yml
similarity index 100%
rename from tests/yaml_flow_mapping/comment-trailing.yml
rename to tests/yaml/flow-mapping/comment-trailing.yml
diff --git a/tests/yaml_flow_mapping/empty-item-colon.yml b/tests/yaml/flow-mapping/empty-item-colon.yml
similarity index 100%
rename from tests/yaml_flow_mapping/empty-item-colon.yml
rename to tests/yaml/flow-mapping/empty-item-colon.yml
diff --git a/tests/yaml_flow_mapping/empty-line-collapse.yml b/tests/yaml/flow-mapping/empty-line-collapse.yml
similarity index 100%
rename from tests/yaml_flow_mapping/empty-line-collapse.yml
rename to tests/yaml/flow-mapping/empty-line-collapse.yml
diff --git a/tests/yaml_flow_mapping/empty-line.yml b/tests/yaml/flow-mapping/empty-line.yml
similarity index 100%
rename from tests/yaml_flow_mapping/empty-line.yml
rename to tests/yaml/flow-mapping/empty-line.yml
diff --git a/tests/yaml_flow_mapping/empty.yml b/tests/yaml/flow-mapping/empty.yml
similarity index 100%
rename from tests/yaml_flow_mapping/empty.yml
rename to tests/yaml/flow-mapping/empty.yml
diff --git a/tests/yaml_flow_mapping/jsfmt.spec.js b/tests/yaml/flow-mapping/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_flow_mapping/jsfmt.spec.js
rename to tests/yaml/flow-mapping/jsfmt.spec.js
diff --git a/tests/yaml_flow_mapping/long-key-long-value.yml b/tests/yaml/flow-mapping/long-key-long-value.yml
similarity index 100%
rename from tests/yaml_flow_mapping/long-key-long-value.yml
rename to tests/yaml/flow-mapping/long-key-long-value.yml
diff --git a/tests/yaml_flow_mapping/long-key.yml b/tests/yaml/flow-mapping/long-key.yml
similarity index 100%
rename from tests/yaml_flow_mapping/long-key.yml
rename to tests/yaml/flow-mapping/long-key.yml
diff --git a/tests/yaml_flow_mapping/long-plain.yml b/tests/yaml/flow-mapping/long-plain.yml
similarity index 100%
rename from tests/yaml_flow_mapping/long-plain.yml
rename to tests/yaml/flow-mapping/long-plain.yml
diff --git a/tests/yaml_flow_mapping/long-value.yml b/tests/yaml/flow-mapping/long-value.yml
similarity index 100%
rename from tests/yaml_flow_mapping/long-value.yml
rename to tests/yaml/flow-mapping/long-value.yml
diff --git a/tests/yaml_flow_mapping/middle-comment.yml b/tests/yaml/flow-mapping/middle-comment.yml
similarity index 100%
rename from tests/yaml_flow_mapping/middle-comment.yml
rename to tests/yaml/flow-mapping/middle-comment.yml
diff --git a/tests/yaml_flow_mapping/middle-comments.yml b/tests/yaml/flow-mapping/middle-comments.yml
similarity index 100%
rename from tests/yaml_flow_mapping/middle-comments.yml
rename to tests/yaml/flow-mapping/middle-comments.yml
diff --git a/tests/yaml_flow_mapping/next-empty-line.yml b/tests/yaml/flow-mapping/next-empty-line.yml
similarity index 100%
rename from tests/yaml_flow_mapping/next-empty-line.yml
rename to tests/yaml/flow-mapping/next-empty-line.yml
diff --git a/tests/yaml_flow_mapping/props-in-map.yml b/tests/yaml/flow-mapping/props-in-map.yml
similarity index 100%
rename from tests/yaml_flow_mapping/props-in-map.yml
rename to tests/yaml/flow-mapping/props-in-map.yml
diff --git a/tests/yaml_flow_mapping/props.yml b/tests/yaml/flow-mapping/props.yml
similarity index 100%
rename from tests/yaml_flow_mapping/props.yml
rename to tests/yaml/flow-mapping/props.yml
diff --git a/tests/yaml_flow_mapping/short-key-short-value.yml b/tests/yaml/flow-mapping/short-key-short-value.yml
similarity index 100%
rename from tests/yaml_flow_mapping/short-key-short-value.yml
rename to tests/yaml/flow-mapping/short-key-short-value.yml
diff --git a/tests/yaml_flow_mapping/short-key.yml b/tests/yaml/flow-mapping/short-key.yml
similarity index 100%
rename from tests/yaml_flow_mapping/short-key.yml
rename to tests/yaml/flow-mapping/short-key.yml
diff --git a/tests/yaml_flow_mapping/short-plain.yml b/tests/yaml/flow-mapping/short-plain.yml
similarity index 100%
rename from tests/yaml_flow_mapping/short-plain.yml
rename to tests/yaml/flow-mapping/short-plain.yml
diff --git a/tests/yaml_flow_mapping/short-value.yml b/tests/yaml/flow-mapping/short-value.yml
similarity index 100%
rename from tests/yaml_flow_mapping/short-value.yml
rename to tests/yaml/flow-mapping/short-value.yml
diff --git a/tests/yaml_flow_mapping/very-long-value.yml b/tests/yaml/flow-mapping/very-long-value.yml
similarity index 100%
rename from tests/yaml_flow_mapping/very-long-value.yml
rename to tests/yaml/flow-mapping/very-long-value.yml
diff --git a/tests/yaml_flow_sequence/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/flow-sequence/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_flow_sequence/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/flow-sequence/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_flow_sequence/alias-key.yml b/tests/yaml/flow-sequence/alias-key.yml
similarity index 100%
rename from tests/yaml_flow_sequence/alias-key.yml
rename to tests/yaml/flow-sequence/alias-key.yml
diff --git a/tests/yaml_flow_sequence/array-key-array-value.yml b/tests/yaml/flow-sequence/array-key-array-value.yml
similarity index 100%
rename from tests/yaml_flow_sequence/array-key-array-value.yml
rename to tests/yaml/flow-sequence/array-key-array-value.yml
diff --git a/tests/yaml_flow_sequence/array-key.yml b/tests/yaml/flow-sequence/array-key.yml
similarity index 100%
rename from tests/yaml_flow_sequence/array-key.yml
rename to tests/yaml/flow-sequence/array-key.yml
diff --git a/tests/yaml_flow_sequence/array-plain.yml b/tests/yaml/flow-sequence/array-plain.yml
similarity index 100%
rename from tests/yaml_flow_sequence/array-plain.yml
rename to tests/yaml/flow-sequence/array-plain.yml
diff --git a/tests/yaml_flow_sequence/array-value.yml b/tests/yaml/flow-sequence/array-value.yml
similarity index 100%
rename from tests/yaml_flow_sequence/array-value.yml
rename to tests/yaml/flow-sequence/array-value.yml
diff --git a/tests/yaml_flow_sequence/comment-between.yml b/tests/yaml/flow-sequence/comment-between.yml
similarity index 100%
rename from tests/yaml_flow_sequence/comment-between.yml
rename to tests/yaml/flow-sequence/comment-between.yml
diff --git a/tests/yaml_flow_sequence/comment-trailing.yml b/tests/yaml/flow-sequence/comment-trailing.yml
similarity index 100%
rename from tests/yaml_flow_sequence/comment-trailing.yml
rename to tests/yaml/flow-sequence/comment-trailing.yml
diff --git a/tests/yaml_flow_sequence/empty-item-colon.yml b/tests/yaml/flow-sequence/empty-item-colon.yml
similarity index 100%
rename from tests/yaml_flow_sequence/empty-item-colon.yml
rename to tests/yaml/flow-sequence/empty-item-colon.yml
diff --git a/tests/yaml_flow_sequence/empty-line-collapse.yml b/tests/yaml/flow-sequence/empty-line-collapse.yml
similarity index 100%
rename from tests/yaml_flow_sequence/empty-line-collapse.yml
rename to tests/yaml/flow-sequence/empty-line-collapse.yml
diff --git a/tests/yaml_flow_sequence/empty-line.yml b/tests/yaml/flow-sequence/empty-line.yml
similarity index 100%
rename from tests/yaml_flow_sequence/empty-line.yml
rename to tests/yaml/flow-sequence/empty-line.yml
diff --git a/tests/yaml_flow_sequence/empty.yml b/tests/yaml/flow-sequence/empty.yml
similarity index 100%
rename from tests/yaml_flow_sequence/empty.yml
rename to tests/yaml/flow-sequence/empty.yml
diff --git a/tests/yaml_flow_sequence/jsfmt.spec.js b/tests/yaml/flow-sequence/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_flow_sequence/jsfmt.spec.js
rename to tests/yaml/flow-sequence/jsfmt.spec.js
diff --git a/tests/yaml_flow_sequence/long-key-long-value.yml b/tests/yaml/flow-sequence/long-key-long-value.yml
similarity index 100%
rename from tests/yaml_flow_sequence/long-key-long-value.yml
rename to tests/yaml/flow-sequence/long-key-long-value.yml
diff --git a/tests/yaml_flow_sequence/long-key.yml b/tests/yaml/flow-sequence/long-key.yml
similarity index 100%
rename from tests/yaml_flow_sequence/long-key.yml
rename to tests/yaml/flow-sequence/long-key.yml
diff --git a/tests/yaml_flow_sequence/long-plain.yml b/tests/yaml/flow-sequence/long-plain.yml
similarity index 100%
rename from tests/yaml_flow_sequence/long-plain.yml
rename to tests/yaml/flow-sequence/long-plain.yml
diff --git a/tests/yaml_flow_sequence/long-value.yml b/tests/yaml/flow-sequence/long-value.yml
similarity index 100%
rename from tests/yaml_flow_sequence/long-value.yml
rename to tests/yaml/flow-sequence/long-value.yml
diff --git a/tests/yaml_flow_sequence/middle-comment.yml b/tests/yaml/flow-sequence/middle-comment.yml
similarity index 100%
rename from tests/yaml_flow_sequence/middle-comment.yml
rename to tests/yaml/flow-sequence/middle-comment.yml
diff --git a/tests/yaml_flow_sequence/middle-comments.yml b/tests/yaml/flow-sequence/middle-comments.yml
similarity index 100%
rename from tests/yaml_flow_sequence/middle-comments.yml
rename to tests/yaml/flow-sequence/middle-comments.yml
diff --git a/tests/yaml_flow_sequence/next-empty-line.yml b/tests/yaml/flow-sequence/next-empty-line.yml
similarity index 100%
rename from tests/yaml_flow_sequence/next-empty-line.yml
rename to tests/yaml/flow-sequence/next-empty-line.yml
diff --git a/tests/yaml_flow_sequence/props-in-map.yml b/tests/yaml/flow-sequence/props-in-map.yml
similarity index 100%
rename from tests/yaml_flow_sequence/props-in-map.yml
rename to tests/yaml/flow-sequence/props-in-map.yml
diff --git a/tests/yaml_flow_sequence/props.yml b/tests/yaml/flow-sequence/props.yml
similarity index 100%
rename from tests/yaml_flow_sequence/props.yml
rename to tests/yaml/flow-sequence/props.yml
diff --git a/tests/yaml_flow_sequence/short-key-short-value.yml b/tests/yaml/flow-sequence/short-key-short-value.yml
similarity index 100%
rename from tests/yaml_flow_sequence/short-key-short-value.yml
rename to tests/yaml/flow-sequence/short-key-short-value.yml
diff --git a/tests/yaml_flow_sequence/short-key.yml b/tests/yaml/flow-sequence/short-key.yml
similarity index 100%
rename from tests/yaml_flow_sequence/short-key.yml
rename to tests/yaml/flow-sequence/short-key.yml
diff --git a/tests/yaml_flow_sequence/short-plain.yml b/tests/yaml/flow-sequence/short-plain.yml
similarity index 100%
rename from tests/yaml_flow_sequence/short-plain.yml
rename to tests/yaml/flow-sequence/short-plain.yml
diff --git a/tests/yaml_flow_sequence/short-value.yml b/tests/yaml/flow-sequence/short-value.yml
similarity index 100%
rename from tests/yaml_flow_sequence/short-value.yml
rename to tests/yaml/flow-sequence/short-value.yml
diff --git a/tests/yaml_insert_pragma/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/insert-pragma/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_insert_pragma/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/insert-pragma/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_insert_pragma/jsfmt.spec.js b/tests/yaml/insert-pragma/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_insert_pragma/jsfmt.spec.js
rename to tests/yaml/insert-pragma/jsfmt.spec.js
diff --git a/tests/yaml_insert_pragma/with-pragma.yml b/tests/yaml/insert-pragma/with-pragma.yml
similarity index 100%
rename from tests/yaml_insert_pragma/with-pragma.yml
rename to tests/yaml/insert-pragma/with-pragma.yml
diff --git a/tests/yaml_insert_pragma/without-pragma.yml b/tests/yaml/insert-pragma/without-pragma.yml
similarity index 100%
rename from tests/yaml_insert_pragma/without-pragma.yml
rename to tests/yaml/insert-pragma/without-pragma.yml
diff --git a/tests/yaml_mapping/3-style.yml b/tests/yaml/mapping/3-style.yml
similarity index 100%
rename from tests/yaml_mapping/3-style.yml
rename to tests/yaml/mapping/3-style.yml
diff --git a/tests/yaml_mapping/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/mapping/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_mapping/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/mapping/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_mapping/array-key.yml b/tests/yaml/mapping/array-key.yml
similarity index 100%
rename from tests/yaml_mapping/array-key.yml
rename to tests/yaml/mapping/array-key.yml
diff --git a/tests/yaml_mapping/array-value.yml b/tests/yaml/mapping/array-value.yml
similarity index 100%
rename from tests/yaml_mapping/array-value.yml
rename to tests/yaml/mapping/array-value.yml
diff --git a/tests/yaml_mapping/comment-value.yml b/tests/yaml/mapping/comment-value.yml
similarity index 100%
rename from tests/yaml_mapping/comment-value.yml
rename to tests/yaml/mapping/comment-value.yml
diff --git a/tests/yaml_mapping/comment.yml b/tests/yaml/mapping/comment.yml
similarity index 100%
rename from tests/yaml_mapping/comment.yml
rename to tests/yaml/mapping/comment.yml
diff --git a/tests/yaml_mapping/common.yml b/tests/yaml/mapping/common.yml
similarity index 100%
rename from tests/yaml_mapping/common.yml
rename to tests/yaml/mapping/common.yml
diff --git a/tests/yaml_mapping/explicit-key.yml b/tests/yaml/mapping/explicit-key.yml
similarity index 100%
rename from tests/yaml_mapping/explicit-key.yml
rename to tests/yaml/mapping/explicit-key.yml
diff --git a/tests/yaml_mapping/in-sequence.yml b/tests/yaml/mapping/in-sequence.yml
similarity index 100%
rename from tests/yaml_mapping/in-sequence.yml
rename to tests/yaml/mapping/in-sequence.yml
diff --git a/tests/yaml_mapping/jsfmt.spec.js b/tests/yaml/mapping/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_mapping/jsfmt.spec.js
rename to tests/yaml/mapping/jsfmt.spec.js
diff --git a/tests/yaml_mapping/key-with-leading-comment.yml b/tests/yaml/mapping/key-with-leading-comment.yml
similarity index 100%
rename from tests/yaml_mapping/key-with-leading-comment.yml
rename to tests/yaml/mapping/key-with-leading-comment.yml
diff --git a/tests/yaml_mapping/mapping.yml b/tests/yaml/mapping/mapping.yml
similarity index 100%
rename from tests/yaml_mapping/mapping.yml
rename to tests/yaml/mapping/mapping.yml
diff --git a/tests/yaml_mapping/merge-twice.yml b/tests/yaml/mapping/merge-twice.yml
similarity index 100%
rename from tests/yaml_mapping/merge-twice.yml
rename to tests/yaml/mapping/merge-twice.yml
diff --git a/tests/yaml_mapping/middle-comment.yml b/tests/yaml/mapping/middle-comment.yml
similarity index 100%
rename from tests/yaml_mapping/middle-comment.yml
rename to tests/yaml/mapping/middle-comment.yml
diff --git a/tests/yaml_mapping/middle-comments.yml b/tests/yaml/mapping/middle-comments.yml
similarity index 100%
rename from tests/yaml_mapping/middle-comments.yml
rename to tests/yaml/mapping/middle-comments.yml
diff --git a/tests/yaml_mapping/props-in-map.yml b/tests/yaml/mapping/props-in-map.yml
similarity index 100%
rename from tests/yaml_mapping/props-in-map.yml
rename to tests/yaml/mapping/props-in-map.yml
diff --git a/tests/yaml_mapping/props.yml b/tests/yaml/mapping/props.yml
similarity index 100%
rename from tests/yaml_mapping/props.yml
rename to tests/yaml/mapping/props.yml
diff --git a/tests/yaml_mapping/quote-key.yml b/tests/yaml/mapping/quote-key.yml
similarity index 100%
rename from tests/yaml_mapping/quote-key.yml
rename to tests/yaml/mapping/quote-key.yml
diff --git a/tests/yaml_mapping/sequence.yml b/tests/yaml/mapping/sequence.yml
similarity index 100%
rename from tests/yaml_mapping/sequence.yml
rename to tests/yaml/mapping/sequence.yml
diff --git a/tests/yaml_mapping/tag-key.yml b/tests/yaml/mapping/tag-key.yml
similarity index 100%
rename from tests/yaml_mapping/tag-key.yml
rename to tests/yaml/mapping/tag-key.yml
diff --git a/tests/yaml_plain/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/plain/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_plain/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/plain/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_plain/force-singleline-in-mapping-value.yml b/tests/yaml/plain/force-singleline-in-mapping-value.yml
similarity index 100%
rename from tests/yaml_plain/force-singleline-in-mapping-value.yml
rename to tests/yaml/plain/force-singleline-in-mapping-value.yml
diff --git a/tests/yaml_plain/jsfmt.spec.js b/tests/yaml/plain/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_plain/jsfmt.spec.js
rename to tests/yaml/plain/jsfmt.spec.js
diff --git a/tests/yaml_plain/middle-comment.yml b/tests/yaml/plain/middle-comment.yml
similarity index 100%
rename from tests/yaml_plain/middle-comment.yml
rename to tests/yaml/plain/middle-comment.yml
diff --git a/tests/yaml_plain/middle-comments.yml b/tests/yaml/plain/middle-comments.yml
similarity index 100%
rename from tests/yaml_plain/middle-comments.yml
rename to tests/yaml/plain/middle-comments.yml
diff --git a/tests/yaml_plain/multiline.yml b/tests/yaml/plain/multiline.yml
similarity index 100%
rename from tests/yaml_plain/multiline.yml
rename to tests/yaml/plain/multiline.yml
diff --git a/tests/yaml_plain/true.yml b/tests/yaml/plain/true.yml
similarity index 100%
rename from tests/yaml_plain/true.yml
rename to tests/yaml/plain/true.yml
diff --git a/tests/yaml_plain/verbatim.yml b/tests/yaml/plain/verbatim.yml
similarity index 100%
rename from tests/yaml_plain/verbatim.yml
rename to tests/yaml/plain/verbatim.yml
diff --git a/tests/yaml_prettier_ignore/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_prettier_ignore/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_prettier_ignore/document.yml b/tests/yaml/prettier-ignore/document.yml
similarity index 100%
rename from tests/yaml_prettier_ignore/document.yml
rename to tests/yaml/prettier-ignore/document.yml
diff --git a/tests/yaml_prettier_ignore/jsfmt.spec.js b/tests/yaml/prettier-ignore/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_prettier_ignore/jsfmt.spec.js
rename to tests/yaml/prettier-ignore/jsfmt.spec.js
diff --git a/tests/yaml_prettier_ignore/leading-comment.yml b/tests/yaml/prettier-ignore/leading-comment.yml
similarity index 100%
rename from tests/yaml_prettier_ignore/leading-comment.yml
rename to tests/yaml/prettier-ignore/leading-comment.yml
diff --git a/tests/yaml_prettier_ignore/middle-comment.yml b/tests/yaml/prettier-ignore/middle-comment.yml
similarity index 100%
rename from tests/yaml_prettier_ignore/middle-comment.yml
rename to tests/yaml/prettier-ignore/middle-comment.yml
diff --git a/tests/yaml_prettier_ignore/trailing-comma.yml b/tests/yaml/prettier-ignore/trailing-comma.yml
similarity index 100%
rename from tests/yaml_prettier_ignore/trailing-comma.yml
rename to tests/yaml/prettier-ignore/trailing-comma.yml
diff --git a/tests/yaml_prettier_ignore/trailing-comment.yml b/tests/yaml/prettier-ignore/trailing-comment.yml
similarity index 100%
rename from tests/yaml_prettier_ignore/trailing-comment.yml
rename to tests/yaml/prettier-ignore/trailing-comment.yml
diff --git a/tests/yaml_quote/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/quote/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_quote/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/quote/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_quote/jsfmt.spec.js b/tests/yaml/quote/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_quote/jsfmt.spec.js
rename to tests/yaml/quote/jsfmt.spec.js
diff --git a/tests/yaml_quote/multiline.yml b/tests/yaml/quote/multiline.yml
similarity index 100%
rename from tests/yaml_quote/multiline.yml
rename to tests/yaml/quote/multiline.yml
diff --git a/tests/yaml_quote/quote.yml b/tests/yaml/quote/quote.yml
similarity index 100%
rename from tests/yaml_quote/quote.yml
rename to tests/yaml/quote/quote.yml
diff --git a/tests/yaml_require_pragma/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/require-pragma/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_require_pragma/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/require-pragma/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_require_pragma/jsfmt.spec.js b/tests/yaml/require-pragma/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_require_pragma/jsfmt.spec.js
rename to tests/yaml/require-pragma/jsfmt.spec.js
diff --git a/tests/yaml_require_pragma/with-pragma.yml b/tests/yaml/require-pragma/with-pragma.yml
similarity index 100%
rename from tests/yaml_require_pragma/with-pragma.yml
rename to tests/yaml/require-pragma/with-pragma.yml
diff --git a/tests/yaml_require_pragma/without-pragma.yml b/tests/yaml/require-pragma/without-pragma.yml
similarity index 100%
rename from tests/yaml_require_pragma/without-pragma.yml
rename to tests/yaml/require-pragma/without-pragma.yml
diff --git a/tests/yaml_root/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/root/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_root/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/root/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_root/documents-with-directive.yml b/tests/yaml/root/documents-with-directive.yml
similarity index 100%
rename from tests/yaml_root/documents-with-directive.yml
rename to tests/yaml/root/documents-with-directive.yml
diff --git a/tests/yaml_root/documents.yml b/tests/yaml/root/documents.yml
similarity index 100%
rename from tests/yaml_root/documents.yml
rename to tests/yaml/root/documents.yml
diff --git a/tests/yaml_root/empty.yml b/tests/yaml/root/empty.yml
similarity index 100%
rename from tests/yaml_root/empty.yml
rename to tests/yaml/root/empty.yml
diff --git a/tests/yaml_root/example.yml b/tests/yaml/root/example.yml
similarity index 100%
rename from tests/yaml_root/example.yml
rename to tests/yaml/root/example.yml
diff --git a/tests/yaml_root/jsfmt.spec.js b/tests/yaml/root/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_root/jsfmt.spec.js
rename to tests/yaml/root/jsfmt.spec.js
diff --git a/tests/yaml_sequence/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/sequence/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_sequence/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/sequence/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_sequence/items.yml b/tests/yaml/sequence/items.yml
similarity index 100%
rename from tests/yaml_sequence/items.yml
rename to tests/yaml/sequence/items.yml
diff --git a/tests/yaml_sequence/jsfmt.spec.js b/tests/yaml/sequence/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_sequence/jsfmt.spec.js
rename to tests/yaml/sequence/jsfmt.spec.js
diff --git a/tests/yaml_sequence/middle-comment.yml b/tests/yaml/sequence/middle-comment.yml
similarity index 100%
rename from tests/yaml_sequence/middle-comment.yml
rename to tests/yaml/sequence/middle-comment.yml
diff --git a/tests/yaml_sequence/middle-comments.yml b/tests/yaml/sequence/middle-comments.yml
similarity index 100%
rename from tests/yaml_sequence/middle-comments.yml
rename to tests/yaml/sequence/middle-comments.yml
diff --git a/tests/yaml_sequence/nested.yml b/tests/yaml/sequence/nested.yml
similarity index 100%
rename from tests/yaml_sequence/nested.yml
rename to tests/yaml/sequence/nested.yml
diff --git a/tests/yaml_sequence/null-item.yml b/tests/yaml/sequence/null-item.yml
similarity index 100%
rename from tests/yaml_sequence/null-item.yml
rename to tests/yaml/sequence/null-item.yml
diff --git a/tests/yaml_sequence/props-in-map.yml b/tests/yaml/sequence/props-in-map.yml
similarity index 100%
rename from tests/yaml_sequence/props-in-map.yml
rename to tests/yaml/sequence/props-in-map.yml
diff --git a/tests/yaml_sequence/props.yml b/tests/yaml/sequence/props.yml
similarity index 100%
rename from tests/yaml_sequence/props.yml
rename to tests/yaml/sequence/props.yml
diff --git a/tests/yaml_spec/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/spec/__snapshots__/jsfmt.spec.js.snap
similarity index 100%
rename from tests/yaml_spec/__snapshots__/jsfmt.spec.js.snap
rename to tests/yaml/spec/__snapshots__/jsfmt.spec.js.snap
diff --git a/tests/yaml_spec/aliases-in-block-sequence.yml b/tests/yaml/spec/aliases-in-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/aliases-in-block-sequence.yml
rename to tests/yaml/spec/aliases-in-block-sequence.yml
diff --git a/tests/yaml_spec/aliases-in-explicit-block-mapping.yml b/tests/yaml/spec/aliases-in-explicit-block-mapping.yml
similarity index 100%
rename from tests/yaml_spec/aliases-in-explicit-block-mapping.yml
rename to tests/yaml/spec/aliases-in-explicit-block-mapping.yml
diff --git a/tests/yaml_spec/allowed-characters-in-alias.yml b/tests/yaml/spec/allowed-characters-in-alias.yml
similarity index 100%
rename from tests/yaml_spec/allowed-characters-in-alias.yml
rename to tests/yaml/spec/allowed-characters-in-alias.yml
diff --git a/tests/yaml_spec/allowed-characters-in-keys.yml b/tests/yaml/spec/allowed-characters-in-keys.yml
similarity index 100%
rename from tests/yaml_spec/allowed-characters-in-keys.yml
rename to tests/yaml/spec/allowed-characters-in-keys.yml
diff --git a/tests/yaml_spec/allowed-characters-in-plain-scalars.yml b/tests/yaml/spec/allowed-characters-in-plain-scalars.yml
similarity index 100%
rename from tests/yaml_spec/allowed-characters-in-plain-scalars.yml
rename to tests/yaml/spec/allowed-characters-in-plain-scalars.yml
diff --git a/tests/yaml_spec/allowed-characters-in-quoted-mapping-key.yml b/tests/yaml/spec/allowed-characters-in-quoted-mapping-key.yml
similarity index 100%
rename from tests/yaml_spec/allowed-characters-in-quoted-mapping-key.yml
rename to tests/yaml/spec/allowed-characters-in-quoted-mapping-key.yml
diff --git a/tests/yaml_spec/anchor-before-zero-indented-sequence.yml b/tests/yaml/spec/anchor-before-zero-indented-sequence.yml
similarity index 100%
rename from tests/yaml_spec/anchor-before-zero-indented-sequence.yml
rename to tests/yaml/spec/anchor-before-zero-indented-sequence.yml
diff --git a/tests/yaml_spec/anchor-with-unicode-character.yml b/tests/yaml/spec/anchor-with-unicode-character.yml
similarity index 100%
rename from tests/yaml_spec/anchor-with-unicode-character.yml
rename to tests/yaml/spec/anchor-with-unicode-character.yml
diff --git a/tests/yaml_spec/anchors-and-tags.yml b/tests/yaml/spec/anchors-and-tags.yml
similarity index 100%
rename from tests/yaml_spec/anchors-and-tags.yml
rename to tests/yaml/spec/anchors-and-tags.yml
diff --git a/tests/yaml_spec/anchors-in-mapping.yml b/tests/yaml/spec/anchors-in-mapping.yml
similarity index 100%
rename from tests/yaml_spec/anchors-in-mapping.yml
rename to tests/yaml/spec/anchors-in-mapping.yml
diff --git a/tests/yaml_spec/anchors-with-colon-in-name.yml b/tests/yaml/spec/anchors-with-colon-in-name.yml
similarity index 100%
rename from tests/yaml_spec/anchors-with-colon-in-name.yml
rename to tests/yaml/spec/anchors-with-colon-in-name.yml
diff --git a/tests/yaml_spec/backslashes-in-singlequotes.yml b/tests/yaml/spec/backslashes-in-singlequotes.yml
similarity index 100%
rename from tests/yaml_spec/backslashes-in-singlequotes.yml
rename to tests/yaml/spec/backslashes-in-singlequotes.yml
diff --git a/tests/yaml_spec/bare-document-after-document-end-marker.yml b/tests/yaml/spec/bare-document-after-document-end-marker.yml
similarity index 100%
rename from tests/yaml_spec/bare-document-after-document-end-marker.yml
rename to tests/yaml/spec/bare-document-after-document-end-marker.yml
diff --git a/tests/yaml_spec/blank-lines.yml b/tests/yaml/spec/blank-lines.yml
similarity index 100%
rename from tests/yaml_spec/blank-lines.yml
rename to tests/yaml/spec/blank-lines.yml
diff --git a/tests/yaml_spec/block-mapping-with-missing-values.yml b/tests/yaml/spec/block-mapping-with-missing-values.yml
similarity index 100%
rename from tests/yaml_spec/block-mapping-with-missing-values.yml
rename to tests/yaml/spec/block-mapping-with-missing-values.yml
diff --git a/tests/yaml_spec/block-mapping-with-multiline-scalars.yml b/tests/yaml/spec/block-mapping-with-multiline-scalars.yml
similarity index 100%
rename from tests/yaml_spec/block-mapping-with-multiline-scalars.yml
rename to tests/yaml/spec/block-mapping-with-multiline-scalars.yml
diff --git a/tests/yaml_spec/block-mappings-in-block-sequence.yml b/tests/yaml/spec/block-mappings-in-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/block-mappings-in-block-sequence.yml
rename to tests/yaml/spec/block-mappings-in-block-sequence.yml
diff --git a/tests/yaml_spec/block-scalar-indicator-order.yml b/tests/yaml/spec/block-scalar-indicator-order.yml
similarity index 100%
rename from tests/yaml_spec/block-scalar-indicator-order.yml
rename to tests/yaml/spec/block-scalar-indicator-order.yml
diff --git a/tests/yaml_spec/block-scalar-keep.yml b/tests/yaml/spec/block-scalar-keep.yml
similarity index 100%
rename from tests/yaml_spec/block-scalar-keep.yml
rename to tests/yaml/spec/block-scalar-keep.yml
diff --git a/tests/yaml_spec/block-scalar-strip.yml b/tests/yaml/spec/block-scalar-strip.yml
similarity index 100%
rename from tests/yaml_spec/block-scalar-strip.yml
rename to tests/yaml/spec/block-scalar-strip.yml
diff --git a/tests/yaml_spec/block-scalar-with-spaces-only.yml b/tests/yaml/spec/block-scalar-with-spaces-only.yml
similarity index 100%
rename from tests/yaml_spec/block-scalar-with-spaces-only.yml
rename to tests/yaml/spec/block-scalar-with-spaces-only.yml
diff --git a/tests/yaml_spec/block-sequence-in-block-mapping.yml b/tests/yaml/spec/block-sequence-in-block-mapping.yml
similarity index 100%
rename from tests/yaml_spec/block-sequence-in-block-mapping.yml
rename to tests/yaml/spec/block-sequence-in-block-mapping.yml
diff --git a/tests/yaml_spec/block-sequence-in-block-sequence.yml b/tests/yaml/spec/block-sequence-in-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/block-sequence-in-block-sequence.yml
rename to tests/yaml/spec/block-sequence-in-block-sequence.yml
diff --git a/tests/yaml_spec/block-submapping.yml b/tests/yaml/spec/block-submapping.yml
similarity index 100%
rename from tests/yaml_spec/block-submapping.yml
rename to tests/yaml/spec/block-submapping.yml
diff --git a/tests/yaml_spec/colon-in-double-quoted-string.yml b/tests/yaml/spec/colon-in-double-quoted-string.yml
similarity index 100%
rename from tests/yaml_spec/colon-in-double-quoted-string.yml
rename to tests/yaml/spec/colon-in-double-quoted-string.yml
diff --git a/tests/yaml_spec/comment-in-flow-sequence-before-comma.yml b/tests/yaml/spec/comment-in-flow-sequence-before-comma.yml
similarity index 100%
rename from tests/yaml_spec/comment-in-flow-sequence-before-comma.yml
rename to tests/yaml/spec/comment-in-flow-sequence-before-comma.yml
diff --git a/tests/yaml_spec/construct-binary.yml b/tests/yaml/spec/construct-binary.yml
similarity index 100%
rename from tests/yaml_spec/construct-binary.yml
rename to tests/yaml/spec/construct-binary.yml
diff --git a/tests/yaml_spec/document-start-on-last-line.yml b/tests/yaml/spec/document-start-on-last-line.yml
similarity index 100%
rename from tests/yaml_spec/document-start-on-last-line.yml
rename to tests/yaml/spec/document-start-on-last-line.yml
diff --git a/tests/yaml_spec/document-with-footer.yml b/tests/yaml/spec/document-with-footer.yml
similarity index 100%
rename from tests/yaml_spec/document-with-footer.yml
rename to tests/yaml/spec/document-with-footer.yml
diff --git a/tests/yaml_spec/empty-lines-at-end-of-document.yml b/tests/yaml/spec/empty-lines-at-end-of-document.yml
similarity index 100%
rename from tests/yaml_spec/empty-lines-at-end-of-document.yml
rename to tests/yaml/spec/empty-lines-at-end-of-document.yml
diff --git a/tests/yaml_spec/empty-lines-between-mapping-elements.yml b/tests/yaml/spec/empty-lines-between-mapping-elements.yml
similarity index 100%
rename from tests/yaml_spec/empty-lines-between-mapping-elements.yml
rename to tests/yaml/spec/empty-lines-between-mapping-elements.yml
diff --git a/tests/yaml_spec/empty-stream.yml b/tests/yaml/spec/empty-stream.yml
similarity index 100%
rename from tests/yaml_spec/empty-stream.yml
rename to tests/yaml/spec/empty-stream.yml
diff --git a/tests/yaml_spec/escaped-slash-in-double-quotes.yml b/tests/yaml/spec/escaped-slash-in-double-quotes.yml
similarity index 100%
rename from tests/yaml_spec/escaped-slash-in-double-quotes.yml
rename to tests/yaml/spec/escaped-slash-in-double-quotes.yml
diff --git a/tests/yaml_spec/explicit-non-specific-tag.yml b/tests/yaml/spec/explicit-non-specific-tag.yml
similarity index 100%
rename from tests/yaml_spec/explicit-non-specific-tag.yml
rename to tests/yaml/spec/explicit-non-specific-tag.yml
diff --git a/tests/yaml_spec/flow-mapping-in-block-sequence.yml b/tests/yaml/spec/flow-mapping-in-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/flow-mapping-in-block-sequence.yml
rename to tests/yaml/spec/flow-mapping-in-block-sequence.yml
diff --git a/tests/yaml_spec/flow-mapping.yml b/tests/yaml/spec/flow-mapping.yml
similarity index 100%
rename from tests/yaml_spec/flow-mapping.yml
rename to tests/yaml/spec/flow-mapping.yml
diff --git a/tests/yaml_spec/flow-sequence-in-block-mapping.yml b/tests/yaml/spec/flow-sequence-in-block-mapping.yml
similarity index 100%
rename from tests/yaml_spec/flow-sequence-in-block-mapping.yml
rename to tests/yaml/spec/flow-sequence-in-block-mapping.yml
diff --git a/tests/yaml_spec/flow-sequence-in-flow-mapping.yml b/tests/yaml/spec/flow-sequence-in-flow-mapping.yml
similarity index 100%
rename from tests/yaml_spec/flow-sequence-in-flow-mapping.yml
rename to tests/yaml/spec/flow-sequence-in-flow-mapping.yml
diff --git a/tests/yaml_spec/flow-sequence-in-flow-sequence.yml b/tests/yaml/spec/flow-sequence-in-flow-sequence.yml
similarity index 100%
rename from tests/yaml_spec/flow-sequence-in-flow-sequence.yml
rename to tests/yaml/spec/flow-sequence-in-flow-sequence.yml
diff --git a/tests/yaml_spec/flow-sequence.yml b/tests/yaml/spec/flow-sequence.yml
similarity index 100%
rename from tests/yaml_spec/flow-sequence.yml
rename to tests/yaml/spec/flow-sequence.yml
diff --git a/tests/yaml_spec/folded-block-scalar.yml b/tests/yaml/spec/folded-block-scalar.yml
similarity index 100%
rename from tests/yaml_spec/folded-block-scalar.yml
rename to tests/yaml/spec/folded-block-scalar.yml
diff --git a/tests/yaml_spec/implicit-flow-mapping-key-on-one-line.yml b/tests/yaml/spec/implicit-flow-mapping-key-on-one-line.yml
similarity index 100%
rename from tests/yaml_spec/implicit-flow-mapping-key-on-one-line.yml
rename to tests/yaml/spec/implicit-flow-mapping-key-on-one-line.yml
diff --git a/tests/yaml_spec/jsfmt.spec.js b/tests/yaml/spec/jsfmt.spec.js
similarity index 100%
rename from tests/yaml_spec/jsfmt.spec.js
rename to tests/yaml/spec/jsfmt.spec.js
diff --git a/tests/yaml_spec/key-with-anchor-after-missing-explicit-mapping-value.yml b/tests/yaml/spec/key-with-anchor-after-missing-explicit-mapping-value.yml
similarity index 100%
rename from tests/yaml_spec/key-with-anchor-after-missing-explicit-mapping-value.yml
rename to tests/yaml/spec/key-with-anchor-after-missing-explicit-mapping-value.yml
diff --git a/tests/yaml_spec/literal-block-scalar.yml b/tests/yaml/spec/literal-block-scalar.yml
similarity index 100%
rename from tests/yaml_spec/literal-block-scalar.yml
rename to tests/yaml/spec/literal-block-scalar.yml
diff --git a/tests/yaml_spec/literal-unicode.yml b/tests/yaml/spec/literal-unicode.yml
similarity index 100%
rename from tests/yaml_spec/literal-unicode.yml
rename to tests/yaml/spec/literal-unicode.yml
diff --git a/tests/yaml_spec/lookahead-test-cases.yml b/tests/yaml/spec/lookahead-test-cases.yml
similarity index 100%
rename from tests/yaml_spec/lookahead-test-cases.yml
rename to tests/yaml/spec/lookahead-test-cases.yml
diff --git a/tests/yaml_spec/mapping-key-and-flow-sequence-item-anchors.yml b/tests/yaml/spec/mapping-key-and-flow-sequence-item-anchors.yml
similarity index 100%
rename from tests/yaml_spec/mapping-key-and-flow-sequence-item-anchors.yml
rename to tests/yaml/spec/mapping-key-and-flow-sequence-item-anchors.yml
diff --git a/tests/yaml_spec/mixed-block-mapping-explicit-to-implicit.yml b/tests/yaml/spec/mixed-block-mapping-explicit-to-implicit.yml
similarity index 100%
rename from tests/yaml_spec/mixed-block-mapping-explicit-to-implicit.yml
rename to tests/yaml/spec/mixed-block-mapping-explicit-to-implicit.yml
diff --git a/tests/yaml_spec/mixed-block-mapping-implicit-to-explicit.yml b/tests/yaml/spec/mixed-block-mapping-implicit-to-explicit.yml
similarity index 100%
rename from tests/yaml_spec/mixed-block-mapping-implicit-to-explicit.yml
rename to tests/yaml/spec/mixed-block-mapping-implicit-to-explicit.yml
diff --git a/tests/yaml_spec/multi-level-mapping-indent.yml b/tests/yaml/spec/multi-level-mapping-indent.yml
similarity index 100%
rename from tests/yaml_spec/multi-level-mapping-indent.yml
rename to tests/yaml/spec/multi-level-mapping-indent.yml
diff --git a/tests/yaml_spec/multiline-plain-scalar-with-empty-line.yml b/tests/yaml/spec/multiline-plain-scalar-with-empty-line.yml
similarity index 100%
rename from tests/yaml_spec/multiline-plain-scalar-with-empty-line.yml
rename to tests/yaml/spec/multiline-plain-scalar-with-empty-line.yml
diff --git a/tests/yaml_spec/multiline-scalar-at-top-level.yml b/tests/yaml/spec/multiline-scalar-at-top-level.yml
similarity index 100%
rename from tests/yaml_spec/multiline-scalar-at-top-level.yml
rename to tests/yaml/spec/multiline-scalar-at-top-level.yml
diff --git a/tests/yaml_spec/multiline-scalar-in-mapping.yml b/tests/yaml/spec/multiline-scalar-in-mapping.yml
similarity index 100%
rename from tests/yaml_spec/multiline-scalar-in-mapping.yml
rename to tests/yaml/spec/multiline-scalar-in-mapping.yml
diff --git a/tests/yaml_spec/multiline-scalar-that-looks-like-a-yaml-directive.yml b/tests/yaml/spec/multiline-scalar-that-looks-like-a-yaml-directive.yml
similarity index 100%
rename from tests/yaml_spec/multiline-scalar-that-looks-like-a-yaml-directive.yml
rename to tests/yaml/spec/multiline-scalar-that-looks-like-a-yaml-directive.yml
diff --git a/tests/yaml_spec/multiple-entry-block-sequence.yml b/tests/yaml/spec/multiple-entry-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/multiple-entry-block-sequence.yml
rename to tests/yaml/spec/multiple-entry-block-sequence.yml
diff --git a/tests/yaml_spec/multiple-pair-block-mapping.yml b/tests/yaml/spec/multiple-pair-block-mapping.yml
similarity index 100%
rename from tests/yaml_spec/multiple-pair-block-mapping.yml
rename to tests/yaml/spec/multiple-pair-block-mapping.yml
diff --git a/tests/yaml_spec/nested-flow-collections-on-one-line.yml b/tests/yaml/spec/nested-flow-collections-on-one-line.yml
similarity index 100%
rename from tests/yaml_spec/nested-flow-collections-on-one-line.yml
rename to tests/yaml/spec/nested-flow-collections-on-one-line.yml
diff --git a/tests/yaml_spec/nested-flow-collections.yml b/tests/yaml/spec/nested-flow-collections.yml
similarity index 100%
rename from tests/yaml_spec/nested-flow-collections.yml
rename to tests/yaml/spec/nested-flow-collections.yml
diff --git a/tests/yaml_spec/node-anchor-and-tag-on-seperate-lines.yml b/tests/yaml/spec/node-anchor-and-tag-on-seperate-lines.yml
similarity index 100%
rename from tests/yaml_spec/node-anchor-and-tag-on-seperate-lines.yml
rename to tests/yaml/spec/node-anchor-and-tag-on-seperate-lines.yml
diff --git a/tests/yaml_spec/node-and-mapping-key-anchors.yml b/tests/yaml/spec/node-and-mapping-key-anchors.yml
similarity index 100%
rename from tests/yaml_spec/node-and-mapping-key-anchors.yml
rename to tests/yaml/spec/node-and-mapping-key-anchors.yml
diff --git a/tests/yaml_spec/non-specific-tags-on-scalars.yml b/tests/yaml/spec/non-specific-tags-on-scalars.yml
similarity index 100%
rename from tests/yaml_spec/non-specific-tags-on-scalars.yml
rename to tests/yaml/spec/non-specific-tags-on-scalars.yml
diff --git a/tests/yaml_spec/plain-mapping-key-ending-with-colon.yml b/tests/yaml/spec/plain-mapping-key-ending-with-colon.yml
similarity index 100%
rename from tests/yaml_spec/plain-mapping-key-ending-with-colon.yml
rename to tests/yaml/spec/plain-mapping-key-ending-with-colon.yml
diff --git a/tests/yaml_spec/plain-scalar-looking-like-key-comment-anchor-and-tag.yml b/tests/yaml/spec/plain-scalar-looking-like-key-comment-anchor-and-tag.yml
similarity index 100%
rename from tests/yaml_spec/plain-scalar-looking-like-key-comment-anchor-and-tag.yml
rename to tests/yaml/spec/plain-scalar-looking-like-key-comment-anchor-and-tag.yml
diff --git a/tests/yaml_spec/plain-scalar-with-backslashes.yml b/tests/yaml/spec/plain-scalar-with-backslashes.yml
similarity index 100%
rename from tests/yaml_spec/plain-scalar-with-backslashes.yml
rename to tests/yaml/spec/plain-scalar-with-backslashes.yml
diff --git a/tests/yaml_spec/plain-url-in-flow-mapping.yml b/tests/yaml/spec/plain-url-in-flow-mapping.yml
similarity index 100%
rename from tests/yaml_spec/plain-url-in-flow-mapping.yml
rename to tests/yaml/spec/plain-url-in-flow-mapping.yml
diff --git a/tests/yaml_spec/scalars-on-line.yml b/tests/yaml/spec/scalars-on-line.yml
similarity index 100%
rename from tests/yaml_spec/scalars-on-line.yml
rename to tests/yaml/spec/scalars-on-line.yml
diff --git a/tests/yaml_spec/sequence-entry-that-looks-like-two-with-wrong-indentation.yml b/tests/yaml/spec/sequence-entry-that-looks-like-two-with-wrong-indentation.yml
similarity index 100%
rename from tests/yaml_spec/sequence-entry-that-looks-like-two-with-wrong-indentation.yml
rename to tests/yaml/spec/sequence-entry-that-looks-like-two-with-wrong-indentation.yml
diff --git a/tests/yaml_spec/sequence-indent.yml b/tests/yaml/spec/sequence-indent.yml
similarity index 100%
rename from tests/yaml_spec/sequence-indent.yml
rename to tests/yaml/spec/sequence-indent.yml
diff --git a/tests/yaml_spec/sequence-with-same-indentation-as-parent-mapping.yml b/tests/yaml/spec/sequence-with-same-indentation-as-parent-mapping.yml
similarity index 100%
rename from tests/yaml_spec/sequence-with-same-indentation-as-parent-mapping.yml
rename to tests/yaml/spec/sequence-with-same-indentation-as-parent-mapping.yml
diff --git a/tests/yaml_spec/simple-mapping-indent.yml b/tests/yaml/spec/simple-mapping-indent.yml
similarity index 100%
rename from tests/yaml_spec/simple-mapping-indent.yml
rename to tests/yaml/spec/simple-mapping-indent.yml
diff --git a/tests/yaml_spec/single-entry-block-sequence.yml b/tests/yaml/spec/single-entry-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/single-entry-block-sequence.yml
rename to tests/yaml/spec/single-entry-block-sequence.yml
diff --git a/tests/yaml_spec/single-pair-block-mapping.yml b/tests/yaml/spec/single-pair-block-mapping.yml
similarity index 100%
rename from tests/yaml_spec/single-pair-block-mapping.yml
rename to tests/yaml/spec/single-pair-block-mapping.yml
diff --git a/tests/yaml_spec/spec-example-2-1-sequence-of-scalars.yml b/tests/yaml/spec/spec-example-2-1-sequence-of-scalars.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-1-sequence-of-scalars.yml
rename to tests/yaml/spec/spec-example-2-1-sequence-of-scalars.yml
diff --git a/tests/yaml_spec/spec-example-2-10-node-for-sammy-sosa-appears-twice-in-this-document.yml b/tests/yaml/spec/spec-example-2-10-node-for-sammy-sosa-appears-twice-in-this-document.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-10-node-for-sammy-sosa-appears-twice-in-this-document.yml
rename to tests/yaml/spec/spec-example-2-10-node-for-sammy-sosa-appears-twice-in-this-document.yml
diff --git a/tests/yaml_spec/spec-example-2-11-mapping-between-sequences.yml b/tests/yaml/spec/spec-example-2-11-mapping-between-sequences.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-11-mapping-between-sequences.yml
rename to tests/yaml/spec/spec-example-2-11-mapping-between-sequences.yml
diff --git a/tests/yaml_spec/spec-example-2-12-compact-nested-mapping.yml b/tests/yaml/spec/spec-example-2-12-compact-nested-mapping.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-12-compact-nested-mapping.yml
rename to tests/yaml/spec/spec-example-2-12-compact-nested-mapping.yml
diff --git a/tests/yaml_spec/spec-example-2-13-in-literals-newlines-are-preserved.yml b/tests/yaml/spec/spec-example-2-13-in-literals-newlines-are-preserved.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-13-in-literals-newlines-are-preserved.yml
rename to tests/yaml/spec/spec-example-2-13-in-literals-newlines-are-preserved.yml
diff --git a/tests/yaml_spec/spec-example-2-14-in-the-folded-scalars-newlines-become-spaces.yml b/tests/yaml/spec/spec-example-2-14-in-the-folded-scalars-newlines-become-spaces.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-14-in-the-folded-scalars-newlines-become-spaces.yml
rename to tests/yaml/spec/spec-example-2-14-in-the-folded-scalars-newlines-become-spaces.yml
diff --git a/tests/yaml_spec/spec-example-2-15-folded-newlines-are-preserved-for-more-indented-and-blank-lines.yml b/tests/yaml/spec/spec-example-2-15-folded-newlines-are-preserved-for-more-indented-and-blank-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-15-folded-newlines-are-preserved-for-more-indented-and-blank-lines.yml
rename to tests/yaml/spec/spec-example-2-15-folded-newlines-are-preserved-for-more-indented-and-blank-lines.yml
diff --git a/tests/yaml_spec/spec-example-2-16-indentation-determines-scope.yml b/tests/yaml/spec/spec-example-2-16-indentation-determines-scope.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-16-indentation-determines-scope.yml
rename to tests/yaml/spec/spec-example-2-16-indentation-determines-scope.yml
diff --git a/tests/yaml_spec/spec-example-2-17-quoted-scalars.yml b/tests/yaml/spec/spec-example-2-17-quoted-scalars.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-17-quoted-scalars.yml
rename to tests/yaml/spec/spec-example-2-17-quoted-scalars.yml
diff --git a/tests/yaml_spec/spec-example-2-18-multi-line-flow-scalars.yml b/tests/yaml/spec/spec-example-2-18-multi-line-flow-scalars.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-18-multi-line-flow-scalars.yml
rename to tests/yaml/spec/spec-example-2-18-multi-line-flow-scalars.yml
diff --git a/tests/yaml_spec/spec-example-2-2-mapping-scalars-to-scalars.yml b/tests/yaml/spec/spec-example-2-2-mapping-scalars-to-scalars.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-2-mapping-scalars-to-scalars.yml
rename to tests/yaml/spec/spec-example-2-2-mapping-scalars-to-scalars.yml
diff --git a/tests/yaml_spec/spec-example-2-23-various-explicit-tags.yml b/tests/yaml/spec/spec-example-2-23-various-explicit-tags.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-23-various-explicit-tags.yml
rename to tests/yaml/spec/spec-example-2-23-various-explicit-tags.yml
diff --git a/tests/yaml_spec/spec-example-2-24-global-tags.yml b/tests/yaml/spec/spec-example-2-24-global-tags.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-24-global-tags.yml
rename to tests/yaml/spec/spec-example-2-24-global-tags.yml
diff --git a/tests/yaml_spec/spec-example-2-25-unordered-sets.yml b/tests/yaml/spec/spec-example-2-25-unordered-sets.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-25-unordered-sets.yml
rename to tests/yaml/spec/spec-example-2-25-unordered-sets.yml
diff --git a/tests/yaml_spec/spec-example-2-26-ordered-mappings.yml b/tests/yaml/spec/spec-example-2-26-ordered-mappings.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-26-ordered-mappings.yml
rename to tests/yaml/spec/spec-example-2-26-ordered-mappings.yml
diff --git a/tests/yaml_spec/spec-example-2-27-invoice.yml b/tests/yaml/spec/spec-example-2-27-invoice.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-27-invoice.yml
rename to tests/yaml/spec/spec-example-2-27-invoice.yml
diff --git a/tests/yaml_spec/spec-example-2-28-log-file.yml b/tests/yaml/spec/spec-example-2-28-log-file.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-28-log-file.yml
rename to tests/yaml/spec/spec-example-2-28-log-file.yml
diff --git a/tests/yaml_spec/spec-example-2-3-mapping-scalars-to-sequences.yml b/tests/yaml/spec/spec-example-2-3-mapping-scalars-to-sequences.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-3-mapping-scalars-to-sequences.yml
rename to tests/yaml/spec/spec-example-2-3-mapping-scalars-to-sequences.yml
diff --git a/tests/yaml_spec/spec-example-2-4-sequence-of-mappings.yml b/tests/yaml/spec/spec-example-2-4-sequence-of-mappings.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-4-sequence-of-mappings.yml
rename to tests/yaml/spec/spec-example-2-4-sequence-of-mappings.yml
diff --git a/tests/yaml_spec/spec-example-2-5-sequence-of-sequences.yml b/tests/yaml/spec/spec-example-2-5-sequence-of-sequences.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-5-sequence-of-sequences.yml
rename to tests/yaml/spec/spec-example-2-5-sequence-of-sequences.yml
diff --git a/tests/yaml_spec/spec-example-2-6-mapping-of-mappings.yml b/tests/yaml/spec/spec-example-2-6-mapping-of-mappings.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-6-mapping-of-mappings.yml
rename to tests/yaml/spec/spec-example-2-6-mapping-of-mappings.yml
diff --git a/tests/yaml_spec/spec-example-2-7-two-documents-in-a-stream.yml b/tests/yaml/spec/spec-example-2-7-two-documents-in-a-stream.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-7-two-documents-in-a-stream.yml
rename to tests/yaml/spec/spec-example-2-7-two-documents-in-a-stream.yml
diff --git a/tests/yaml_spec/spec-example-2-8-play-by-play-feed-from-a-game.yml b/tests/yaml/spec/spec-example-2-8-play-by-play-feed-from-a-game.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-8-play-by-play-feed-from-a-game.yml
rename to tests/yaml/spec/spec-example-2-8-play-by-play-feed-from-a-game.yml
diff --git a/tests/yaml_spec/spec-example-2-9-single-document-with-two-comments.yml b/tests/yaml/spec/spec-example-2-9-single-document-with-two-comments.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-2-9-single-document-with-two-comments.yml
rename to tests/yaml/spec/spec-example-2-9-single-document-with-two-comments.yml
diff --git a/tests/yaml_spec/spec-example-5-12-tabs-and-spaces.yml b/tests/yaml/spec/spec-example-5-12-tabs-and-spaces.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-12-tabs-and-spaces.yml
rename to tests/yaml/spec/spec-example-5-12-tabs-and-spaces.yml
diff --git a/tests/yaml_spec/spec-example-5-3-block-structure-indicators.yml b/tests/yaml/spec/spec-example-5-3-block-structure-indicators.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-3-block-structure-indicators.yml
rename to tests/yaml/spec/spec-example-5-3-block-structure-indicators.yml
diff --git a/tests/yaml_spec/spec-example-5-4-flow-collection-indicators.yml b/tests/yaml/spec/spec-example-5-4-flow-collection-indicators.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-4-flow-collection-indicators.yml
rename to tests/yaml/spec/spec-example-5-4-flow-collection-indicators.yml
diff --git a/tests/yaml_spec/spec-example-5-5-comment-indicator.yml b/tests/yaml/spec/spec-example-5-5-comment-indicator.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-5-comment-indicator.yml
rename to tests/yaml/spec/spec-example-5-5-comment-indicator.yml
diff --git a/tests/yaml_spec/spec-example-5-6-node-property-indicators.yml b/tests/yaml/spec/spec-example-5-6-node-property-indicators.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-6-node-property-indicators.yml
rename to tests/yaml/spec/spec-example-5-6-node-property-indicators.yml
diff --git a/tests/yaml_spec/spec-example-5-7-block-scalar-indicators.yml b/tests/yaml/spec/spec-example-5-7-block-scalar-indicators.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-7-block-scalar-indicators.yml
rename to tests/yaml/spec/spec-example-5-7-block-scalar-indicators.yml
diff --git a/tests/yaml_spec/spec-example-5-8-quoted-scalar-indicators.yml b/tests/yaml/spec/spec-example-5-8-quoted-scalar-indicators.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-8-quoted-scalar-indicators.yml
rename to tests/yaml/spec/spec-example-5-8-quoted-scalar-indicators.yml
diff --git a/tests/yaml_spec/spec-example-5-9-directive-indicator.yml b/tests/yaml/spec/spec-example-5-9-directive-indicator.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-5-9-directive-indicator.yml
rename to tests/yaml/spec/spec-example-5-9-directive-indicator.yml
diff --git a/tests/yaml_spec/spec-example-6-1-indentation-spaces.yml b/tests/yaml/spec/spec-example-6-1-indentation-spaces.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-1-indentation-spaces.yml
rename to tests/yaml/spec/spec-example-6-1-indentation-spaces.yml
diff --git a/tests/yaml_spec/spec-example-6-10-comment-lines.yml b/tests/yaml/spec/spec-example-6-10-comment-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-10-comment-lines.yml
rename to tests/yaml/spec/spec-example-6-10-comment-lines.yml
diff --git a/tests/yaml_spec/spec-example-6-11-multi-line-comments.yml b/tests/yaml/spec/spec-example-6-11-multi-line-comments.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-11-multi-line-comments.yml
rename to tests/yaml/spec/spec-example-6-11-multi-line-comments.yml
diff --git a/tests/yaml_spec/spec-example-6-12-separation-spaces.yml b/tests/yaml/spec/spec-example-6-12-separation-spaces.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-12-separation-spaces.yml
rename to tests/yaml/spec/spec-example-6-12-separation-spaces.yml
diff --git a/tests/yaml_spec/spec-example-6-13-reserved-directives.yml b/tests/yaml/spec/spec-example-6-13-reserved-directives.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-13-reserved-directives.yml
rename to tests/yaml/spec/spec-example-6-13-reserved-directives.yml
diff --git a/tests/yaml_spec/spec-example-6-14-yaml-directive.yml b/tests/yaml/spec/spec-example-6-14-yaml-directive.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-14-yaml-directive.yml
rename to tests/yaml/spec/spec-example-6-14-yaml-directive.yml
diff --git a/tests/yaml_spec/spec-example-6-16-tag-directive.yml b/tests/yaml/spec/spec-example-6-16-tag-directive.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-16-tag-directive.yml
rename to tests/yaml/spec/spec-example-6-16-tag-directive.yml
diff --git a/tests/yaml_spec/spec-example-6-18-primary-tag-handle.yml b/tests/yaml/spec/spec-example-6-18-primary-tag-handle.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-18-primary-tag-handle.yml
rename to tests/yaml/spec/spec-example-6-18-primary-tag-handle.yml
diff --git a/tests/yaml_spec/spec-example-6-19-secondary-tag-handle.yml b/tests/yaml/spec/spec-example-6-19-secondary-tag-handle.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-19-secondary-tag-handle.yml
rename to tests/yaml/spec/spec-example-6-19-secondary-tag-handle.yml
diff --git a/tests/yaml_spec/spec-example-6-2-indentation-indicators.yml b/tests/yaml/spec/spec-example-6-2-indentation-indicators.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-2-indentation-indicators.yml
rename to tests/yaml/spec/spec-example-6-2-indentation-indicators.yml
diff --git a/tests/yaml_spec/spec-example-6-20-tag-handles.yml b/tests/yaml/spec/spec-example-6-20-tag-handles.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-20-tag-handles.yml
rename to tests/yaml/spec/spec-example-6-20-tag-handles.yml
diff --git a/tests/yaml_spec/spec-example-6-21-local-tag-prefix.yml b/tests/yaml/spec/spec-example-6-21-local-tag-prefix.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-21-local-tag-prefix.yml
rename to tests/yaml/spec/spec-example-6-21-local-tag-prefix.yml
diff --git a/tests/yaml_spec/spec-example-6-22-global-tag-prefix.yml b/tests/yaml/spec/spec-example-6-22-global-tag-prefix.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-22-global-tag-prefix.yml
rename to tests/yaml/spec/spec-example-6-22-global-tag-prefix.yml
diff --git a/tests/yaml_spec/spec-example-6-23-node-properties.yml b/tests/yaml/spec/spec-example-6-23-node-properties.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-23-node-properties.yml
rename to tests/yaml/spec/spec-example-6-23-node-properties.yml
diff --git a/tests/yaml_spec/spec-example-6-24-verbatim-tags.yml b/tests/yaml/spec/spec-example-6-24-verbatim-tags.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-24-verbatim-tags.yml
rename to tests/yaml/spec/spec-example-6-24-verbatim-tags.yml
diff --git a/tests/yaml_spec/spec-example-6-26-tag-shorthands.yml b/tests/yaml/spec/spec-example-6-26-tag-shorthands.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-26-tag-shorthands.yml
rename to tests/yaml/spec/spec-example-6-26-tag-shorthands.yml
diff --git a/tests/yaml_spec/spec-example-6-28-non-specific-tags.yml b/tests/yaml/spec/spec-example-6-28-non-specific-tags.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-28-non-specific-tags.yml
rename to tests/yaml/spec/spec-example-6-28-non-specific-tags.yml
diff --git a/tests/yaml_spec/spec-example-6-29-node-anchors.yml b/tests/yaml/spec/spec-example-6-29-node-anchors.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-29-node-anchors.yml
rename to tests/yaml/spec/spec-example-6-29-node-anchors.yml
diff --git a/tests/yaml_spec/spec-example-6-3-separation-spaces.yml b/tests/yaml/spec/spec-example-6-3-separation-spaces.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-3-separation-spaces.yml
rename to tests/yaml/spec/spec-example-6-3-separation-spaces.yml
diff --git a/tests/yaml_spec/spec-example-6-4-line-prefixes.yml b/tests/yaml/spec/spec-example-6-4-line-prefixes.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-4-line-prefixes.yml
rename to tests/yaml/spec/spec-example-6-4-line-prefixes.yml
diff --git a/tests/yaml_spec/spec-example-6-5-empty-lines.yml b/tests/yaml/spec/spec-example-6-5-empty-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-5-empty-lines.yml
rename to tests/yaml/spec/spec-example-6-5-empty-lines.yml
diff --git a/tests/yaml_spec/spec-example-6-6-line-folding.yml b/tests/yaml/spec/spec-example-6-6-line-folding.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-6-line-folding.yml
rename to tests/yaml/spec/spec-example-6-6-line-folding.yml
diff --git a/tests/yaml_spec/spec-example-6-7-block-folding.yml b/tests/yaml/spec/spec-example-6-7-block-folding.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-7-block-folding.yml
rename to tests/yaml/spec/spec-example-6-7-block-folding.yml
diff --git a/tests/yaml_spec/spec-example-6-8-flow-folding.yml b/tests/yaml/spec/spec-example-6-8-flow-folding.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-8-flow-folding.yml
rename to tests/yaml/spec/spec-example-6-8-flow-folding.yml
diff --git a/tests/yaml_spec/spec-example-6-9-separated-comment.yml b/tests/yaml/spec/spec-example-6-9-separated-comment.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-6-9-separated-comment.yml
rename to tests/yaml/spec/spec-example-6-9-separated-comment.yml
diff --git a/tests/yaml_spec/spec-example-7-1-alias-nodes.yml b/tests/yaml/spec/spec-example-7-1-alias-nodes.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-1-alias-nodes.yml
rename to tests/yaml/spec/spec-example-7-1-alias-nodes.yml
diff --git a/tests/yaml_spec/spec-example-7-10-plain-characters.yml b/tests/yaml/spec/spec-example-7-10-plain-characters.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-10-plain-characters.yml
rename to tests/yaml/spec/spec-example-7-10-plain-characters.yml
diff --git a/tests/yaml_spec/spec-example-7-11-plain-implicit-keys.yml b/tests/yaml/spec/spec-example-7-11-plain-implicit-keys.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-11-plain-implicit-keys.yml
rename to tests/yaml/spec/spec-example-7-11-plain-implicit-keys.yml
diff --git a/tests/yaml_spec/spec-example-7-12-plain-lines.yml b/tests/yaml/spec/spec-example-7-12-plain-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-12-plain-lines.yml
rename to tests/yaml/spec/spec-example-7-12-plain-lines.yml
diff --git a/tests/yaml_spec/spec-example-7-13-flow-sequence.yml b/tests/yaml/spec/spec-example-7-13-flow-sequence.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-13-flow-sequence.yml
rename to tests/yaml/spec/spec-example-7-13-flow-sequence.yml
diff --git a/tests/yaml_spec/spec-example-7-14-flow-sequence-entries.yml b/tests/yaml/spec/spec-example-7-14-flow-sequence-entries.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-14-flow-sequence-entries.yml
rename to tests/yaml/spec/spec-example-7-14-flow-sequence-entries.yml
diff --git a/tests/yaml_spec/spec-example-7-15-flow-mappings.yml b/tests/yaml/spec/spec-example-7-15-flow-mappings.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-15-flow-mappings.yml
rename to tests/yaml/spec/spec-example-7-15-flow-mappings.yml
diff --git a/tests/yaml_spec/spec-example-7-16-flow-mapping-entries.yml b/tests/yaml/spec/spec-example-7-16-flow-mapping-entries.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-16-flow-mapping-entries.yml
rename to tests/yaml/spec/spec-example-7-16-flow-mapping-entries.yml
diff --git a/tests/yaml_spec/spec-example-7-17-flow-mapping-separate-values.yml b/tests/yaml/spec/spec-example-7-17-flow-mapping-separate-values.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-17-flow-mapping-separate-values.yml
rename to tests/yaml/spec/spec-example-7-17-flow-mapping-separate-values.yml
diff --git a/tests/yaml_spec/spec-example-7-18-flow-mapping-adjacent-values.yml b/tests/yaml/spec/spec-example-7-18-flow-mapping-adjacent-values.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-18-flow-mapping-adjacent-values.yml
rename to tests/yaml/spec/spec-example-7-18-flow-mapping-adjacent-values.yml
diff --git a/tests/yaml_spec/spec-example-7-19-single-pair-flow-mappings.yml b/tests/yaml/spec/spec-example-7-19-single-pair-flow-mappings.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-19-single-pair-flow-mappings.yml
rename to tests/yaml/spec/spec-example-7-19-single-pair-flow-mappings.yml
diff --git a/tests/yaml_spec/spec-example-7-2-empty-content.yml b/tests/yaml/spec/spec-example-7-2-empty-content.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-2-empty-content.yml
rename to tests/yaml/spec/spec-example-7-2-empty-content.yml
diff --git a/tests/yaml_spec/spec-example-7-20-single-pair-explicit-entry.yml b/tests/yaml/spec/spec-example-7-20-single-pair-explicit-entry.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-20-single-pair-explicit-entry.yml
rename to tests/yaml/spec/spec-example-7-20-single-pair-explicit-entry.yml
diff --git a/tests/yaml_spec/spec-example-7-21-single-pair-implicit-entries.yml b/tests/yaml/spec/spec-example-7-21-single-pair-implicit-entries.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-21-single-pair-implicit-entries.yml
rename to tests/yaml/spec/spec-example-7-21-single-pair-implicit-entries.yml
diff --git a/tests/yaml_spec/spec-example-7-23-flow-content.yml b/tests/yaml/spec/spec-example-7-23-flow-content.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-23-flow-content.yml
rename to tests/yaml/spec/spec-example-7-23-flow-content.yml
diff --git a/tests/yaml_spec/spec-example-7-24-flow-nodes.yml b/tests/yaml/spec/spec-example-7-24-flow-nodes.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-24-flow-nodes.yml
rename to tests/yaml/spec/spec-example-7-24-flow-nodes.yml
diff --git a/tests/yaml_spec/spec-example-7-3-completely-empty-flow-nodes.yml b/tests/yaml/spec/spec-example-7-3-completely-empty-flow-nodes.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-3-completely-empty-flow-nodes.yml
rename to tests/yaml/spec/spec-example-7-3-completely-empty-flow-nodes.yml
diff --git a/tests/yaml_spec/spec-example-7-4-double-quoted-implicit-keys.yml b/tests/yaml/spec/spec-example-7-4-double-quoted-implicit-keys.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-4-double-quoted-implicit-keys.yml
rename to tests/yaml/spec/spec-example-7-4-double-quoted-implicit-keys.yml
diff --git a/tests/yaml_spec/spec-example-7-5-double-quoted-line-breaks.yml b/tests/yaml/spec/spec-example-7-5-double-quoted-line-breaks.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-5-double-quoted-line-breaks.yml
rename to tests/yaml/spec/spec-example-7-5-double-quoted-line-breaks.yml
diff --git a/tests/yaml_spec/spec-example-7-6-double-quoted-lines.yml b/tests/yaml/spec/spec-example-7-6-double-quoted-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-6-double-quoted-lines.yml
rename to tests/yaml/spec/spec-example-7-6-double-quoted-lines.yml
diff --git a/tests/yaml_spec/spec-example-7-7-single-quoted-characters.yml b/tests/yaml/spec/spec-example-7-7-single-quoted-characters.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-7-single-quoted-characters.yml
rename to tests/yaml/spec/spec-example-7-7-single-quoted-characters.yml
diff --git a/tests/yaml_spec/spec-example-7-8-single-quoted-implicit-keys.yml b/tests/yaml/spec/spec-example-7-8-single-quoted-implicit-keys.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-8-single-quoted-implicit-keys.yml
rename to tests/yaml/spec/spec-example-7-8-single-quoted-implicit-keys.yml
diff --git a/tests/yaml_spec/spec-example-7-9-single-quoted-lines.yml b/tests/yaml/spec/spec-example-7-9-single-quoted-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-7-9-single-quoted-lines.yml
rename to tests/yaml/spec/spec-example-7-9-single-quoted-lines.yml
diff --git a/tests/yaml_spec/spec-example-8-1-block-scalar-header.yml b/tests/yaml/spec/spec-example-8-1-block-scalar-header.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-1-block-scalar-header.yml
rename to tests/yaml/spec/spec-example-8-1-block-scalar-header.yml
diff --git a/tests/yaml_spec/spec-example-8-10-folded-lines-8-13-final-empty-lines.yml b/tests/yaml/spec/spec-example-8-10-folded-lines-8-13-final-empty-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-10-folded-lines-8-13-final-empty-lines.yml
rename to tests/yaml/spec/spec-example-8-10-folded-lines-8-13-final-empty-lines.yml
diff --git a/tests/yaml_spec/spec-example-8-14-block-sequence.yml b/tests/yaml/spec/spec-example-8-14-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-14-block-sequence.yml
rename to tests/yaml/spec/spec-example-8-14-block-sequence.yml
diff --git a/tests/yaml_spec/spec-example-8-15-block-sequence-entry-types.yml b/tests/yaml/spec/spec-example-8-15-block-sequence-entry-types.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-15-block-sequence-entry-types.yml
rename to tests/yaml/spec/spec-example-8-15-block-sequence-entry-types.yml
diff --git a/tests/yaml_spec/spec-example-8-16-block-mappings.yml b/tests/yaml/spec/spec-example-8-16-block-mappings.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-16-block-mappings.yml
rename to tests/yaml/spec/spec-example-8-16-block-mappings.yml
diff --git a/tests/yaml_spec/spec-example-8-17-explicit-block-mapping-entries.yml b/tests/yaml/spec/spec-example-8-17-explicit-block-mapping-entries.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-17-explicit-block-mapping-entries.yml
rename to tests/yaml/spec/spec-example-8-17-explicit-block-mapping-entries.yml
diff --git a/tests/yaml_spec/spec-example-8-18-implicit-block-mapping-entries.yml b/tests/yaml/spec/spec-example-8-18-implicit-block-mapping-entries.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-18-implicit-block-mapping-entries.yml
rename to tests/yaml/spec/spec-example-8-18-implicit-block-mapping-entries.yml
diff --git a/tests/yaml_spec/spec-example-8-19-compact-block-mappings.yml b/tests/yaml/spec/spec-example-8-19-compact-block-mappings.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-19-compact-block-mappings.yml
rename to tests/yaml/spec/spec-example-8-19-compact-block-mappings.yml
diff --git a/tests/yaml_spec/spec-example-8-2-block-indentation-indicator.yml b/tests/yaml/spec/spec-example-8-2-block-indentation-indicator.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-2-block-indentation-indicator.yml
rename to tests/yaml/spec/spec-example-8-2-block-indentation-indicator.yml
diff --git a/tests/yaml_spec/spec-example-8-20-block-node-types.yml b/tests/yaml/spec/spec-example-8-20-block-node-types.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-20-block-node-types.yml
rename to tests/yaml/spec/spec-example-8-20-block-node-types.yml
diff --git a/tests/yaml_spec/spec-example-8-21-block-scalar-nodes.yml b/tests/yaml/spec/spec-example-8-21-block-scalar-nodes.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-21-block-scalar-nodes.yml
rename to tests/yaml/spec/spec-example-8-21-block-scalar-nodes.yml
diff --git a/tests/yaml_spec/spec-example-8-22-block-collection-nodes.yml b/tests/yaml/spec/spec-example-8-22-block-collection-nodes.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-22-block-collection-nodes.yml
rename to tests/yaml/spec/spec-example-8-22-block-collection-nodes.yml
diff --git a/tests/yaml_spec/spec-example-8-4-chomping-final-line-break.yml b/tests/yaml/spec/spec-example-8-4-chomping-final-line-break.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-4-chomping-final-line-break.yml
rename to tests/yaml/spec/spec-example-8-4-chomping-final-line-break.yml
diff --git a/tests/yaml_spec/spec-example-8-5-chomping-trailing-lines.yml b/tests/yaml/spec/spec-example-8-5-chomping-trailing-lines.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-5-chomping-trailing-lines.yml
rename to tests/yaml/spec/spec-example-8-5-chomping-trailing-lines.yml
diff --git a/tests/yaml_spec/spec-example-8-6-empty-scalar-chomping.yml b/tests/yaml/spec/spec-example-8-6-empty-scalar-chomping.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-6-empty-scalar-chomping.yml
rename to tests/yaml/spec/spec-example-8-6-empty-scalar-chomping.yml
diff --git a/tests/yaml_spec/spec-example-8-7-literal-scalar.yml b/tests/yaml/spec/spec-example-8-7-literal-scalar.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-7-literal-scalar.yml
rename to tests/yaml/spec/spec-example-8-7-literal-scalar.yml
diff --git a/tests/yaml_spec/spec-example-8-8-literal-content.yml b/tests/yaml/spec/spec-example-8-8-literal-content.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-8-literal-content.yml
rename to tests/yaml/spec/spec-example-8-8-literal-content.yml
diff --git a/tests/yaml_spec/spec-example-8-9-folded-scalar.yml b/tests/yaml/spec/spec-example-8-9-folded-scalar.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-8-9-folded-scalar.yml
rename to tests/yaml/spec/spec-example-8-9-folded-scalar.yml
diff --git a/tests/yaml_spec/spec-example-9-2-document-markers.yml b/tests/yaml/spec/spec-example-9-2-document-markers.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-9-2-document-markers.yml
rename to tests/yaml/spec/spec-example-9-2-document-markers.yml
diff --git a/tests/yaml_spec/spec-example-9-3-bare-documents.yml b/tests/yaml/spec/spec-example-9-3-bare-documents.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-9-3-bare-documents.yml
rename to tests/yaml/spec/spec-example-9-3-bare-documents.yml
diff --git a/tests/yaml_spec/spec-example-9-4-explicit-documents.yml b/tests/yaml/spec/spec-example-9-4-explicit-documents.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-9-4-explicit-documents.yml
rename to tests/yaml/spec/spec-example-9-4-explicit-documents.yml
diff --git a/tests/yaml_spec/spec-example-9-5-directives-documents.yml b/tests/yaml/spec/spec-example-9-5-directives-documents.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-9-5-directives-documents.yml
rename to tests/yaml/spec/spec-example-9-5-directives-documents.yml
diff --git a/tests/yaml_spec/spec-example-9-6-stream.yml b/tests/yaml/spec/spec-example-9-6-stream.yml
similarity index 100%
rename from tests/yaml_spec/spec-example-9-6-stream.yml
rename to tests/yaml/spec/spec-example-9-6-stream.yml
diff --git a/tests/yaml_spec/tab-after-document-header.yml b/tests/yaml/spec/tab-after-document-header.yml
similarity index 100%
rename from tests/yaml_spec/tab-after-document-header.yml
rename to tests/yaml/spec/tab-after-document-header.yml
diff --git a/tests/yaml_spec/tab-at-beginning-of-line-followed-by-a-flow-mapping.yml b/tests/yaml/spec/tab-at-beginning-of-line-followed-by-a-flow-mapping.yml
similarity index 100%
rename from tests/yaml_spec/tab-at-beginning-of-line-followed-by-a-flow-mapping.yml
rename to tests/yaml/spec/tab-at-beginning-of-line-followed-by-a-flow-mapping.yml
diff --git a/tests/yaml_spec/tags-for-block-objects.yml b/tests/yaml/spec/tags-for-block-objects.yml
similarity index 100%
rename from tests/yaml_spec/tags-for-block-objects.yml
rename to tests/yaml/spec/tags-for-block-objects.yml
diff --git a/tests/yaml_spec/tags-for-flow-objects.yml b/tests/yaml/spec/tags-for-flow-objects.yml
similarity index 100%
rename from tests/yaml_spec/tags-for-flow-objects.yml
rename to tests/yaml/spec/tags-for-flow-objects.yml
diff --git a/tests/yaml_spec/tags-for-root-objects.yml b/tests/yaml/spec/tags-for-root-objects.yml
similarity index 100%
rename from tests/yaml_spec/tags-for-root-objects.yml
rename to tests/yaml/spec/tags-for-root-objects.yml
diff --git a/tests/yaml_spec/tags-in-block-sequence.yml b/tests/yaml/spec/tags-in-block-sequence.yml
similarity index 100%
rename from tests/yaml_spec/tags-in-block-sequence.yml
rename to tests/yaml/spec/tags-in-block-sequence.yml
diff --git a/tests/yaml_spec/tags-in-explicit-mapping.yml b/tests/yaml/spec/tags-in-explicit-mapping.yml
similarity index 100%
rename from tests/yaml_spec/tags-in-explicit-mapping.yml
rename to tests/yaml/spec/tags-in-explicit-mapping.yml
diff --git a/tests/yaml_spec/tags-in-implicit-mapping.yml b/tests/yaml/spec/tags-in-implicit-mapping.yml
similarity index 100%
rename from tests/yaml_spec/tags-in-implicit-mapping.yml
rename to tests/yaml/spec/tags-in-implicit-mapping.yml
diff --git a/tests/yaml_spec/tags-on-empty-scalars.yml b/tests/yaml/spec/tags-on-empty-scalars.yml
similarity index 100%
rename from tests/yaml_spec/tags-on-empty-scalars.yml
rename to tests/yaml/spec/tags-on-empty-scalars.yml
diff --git a/tests/yaml_spec/three-dashes-and-content-without-space.yml b/tests/yaml/spec/three-dashes-and-content-without-space.yml
similarity index 100%
rename from tests/yaml_spec/three-dashes-and-content-without-space.yml
rename to tests/yaml/spec/three-dashes-and-content-without-space.yml
diff --git a/tests/yaml_spec/various-combinations-of-tags-and-anchors.yml b/tests/yaml/spec/various-combinations-of-tags-and-anchors.yml
similarity index 100%
rename from tests/yaml_spec/various-combinations-of-tags-and-anchors.yml
rename to tests/yaml/spec/various-combinations-of-tags-and-anchors.yml
diff --git a/tests/yaml_spec/various-location-of-anchors-in-flow-sequence.yml b/tests/yaml/spec/various-location-of-anchors-in-flow-sequence.yml
similarity index 100%
rename from tests/yaml_spec/various-location-of-anchors-in-flow-sequence.yml
rename to tests/yaml/spec/various-location-of-anchors-in-flow-sequence.yml
diff --git a/tests/yaml_spec/various-trailing-comments.yml b/tests/yaml/spec/various-trailing-comments.yml
similarity index 100%
rename from tests/yaml_spec/various-trailing-comments.yml
rename to tests/yaml/spec/various-trailing-comments.yml
diff --git a/tests/yaml_spec/various-trailing-tabs.yml b/tests/yaml/spec/various-trailing-tabs.yml
similarity index 100%
rename from tests/yaml_spec/various-trailing-tabs.yml
rename to tests/yaml/spec/various-trailing-tabs.yml
diff --git a/tests/yaml_spec/whitespace-after-scalars-in-flow.yml b/tests/yaml/spec/whitespace-after-scalars-in-flow.yml
similarity index 100%
rename from tests/yaml_spec/whitespace-after-scalars-in-flow.yml
rename to tests/yaml/spec/whitespace-after-scalars-in-flow.yml
diff --git a/tests/yaml_spec/whitespace-around-colon-in-mappings.yml b/tests/yaml/spec/whitespace-around-colon-in-mappings.yml
similarity index 100%
rename from tests/yaml_spec/whitespace-around-colon-in-mappings.yml
rename to tests/yaml/spec/whitespace-around-colon-in-mappings.yml
diff --git a/tests/yaml_spec/zero-indented-block-scalar-with-line-that-looks-like-a-comment.yml b/tests/yaml/spec/zero-indented-block-scalar-with-line-that-looks-like-a-comment.yml
similarity index 100%
rename from tests/yaml_spec/zero-indented-block-scalar-with-line-that-looks-like-a-comment.yml
rename to tests/yaml/spec/zero-indented-block-scalar-with-line-that-looks-like-a-comment.yml
diff --git a/tests/yaml_spec/zero-indented-block-scalar.yml b/tests/yaml/spec/zero-indented-block-scalar.yml
similarity index 100%
rename from tests/yaml_spec/zero-indented-block-scalar.yml
rename to tests/yaml/spec/zero-indented-block-scalar.yml
diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js
index 5fa55d19d..7cd79fe59 100644
--- a/tests_config/run_spec.js
+++ b/tests_config/run_spec.js
@@ -29,16 +29,16 @@ const unstableTests = new Map(
     "comments/return-statement.js",
     "comments/tagged-template-literal.js",
     "comments_closure_typecast/iife.js",
-    "markdown_footnoteDefinition/multiline.md",
-    "markdown_spec/example-234.md",
-    "markdown_spec/example-235.md",
+    "markdown/footnoteDefinition/multiline.md",
+    "markdown/spec/example-234.md",
+    "markdown/spec/example-235.md",
     "html/multiparser-js/script-tag-escaping.html",
     [
       "multiparser_js_markdown/codeblock.js",
       (options) => options.proseWrap === "always",
     ],
     ["no-semi/comments.js", (options) => options.semi === false],
-    "yaml_prettier_ignore/document.yml",
+    "yaml/prettier-ignore/document.yml",
   ].map((fixture) => {
     const [file, isUnstable = () => true] = Array.isArray(fixture)
       ? fixture