diff --git a/.gitattributes b/.gitattributes
index b9cadf0aa2e..dd987892fa1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,11 +18,11 @@ tests/compiler/dart2js_extra/eof_line_ending_test.dart -text
 tests/compiler/dart2js_extra/string_interpolation_test.dart -text
 tests/compiler/dart2js_extra/string_interpolation_dynamic_test.dart -text
 tests/compiler/dart2js_extra/literal_string_juxtaposition_test.dart -text
-tests/language_2/raw_string_test.dart -text
-tests/language_2/multiline_strings_test.dart -text
-tests/language_2/multiline_newline_cr.dart -text
-tests/language_2/multiline_newline_crlf.dart -text
-tests/language_2/multiline_newline_lf.dart -text
+tests/language_2/string/raw_string_test.dart -text
+tests/language_2/string/multiline_strings_test.dart -text
+tests/language_2/string/multiline_newline_cr.dart -text
+tests/language_2/string/multiline_newline_crlf.dart -text
+tests/language_2/string/multiline_newline_lf.dart -text
 tests/lib_2/convert/json_pretty_test.dart -text
 tests/lib_2/mirrors/method_mirror_source_line_ending_cr.dart -text
 tests/lib_2/mirrors/method_mirror_source_line_ending_crlf.dart -text
diff --git a/tests/language/abstract_beats_arguments_test.dart b/tests/language/abstract/beats_arguments_test.dart
similarity index 100%
rename from tests/language/abstract_beats_arguments_test.dart
rename to tests/language/abstract/beats_arguments_test.dart
diff --git a/tests/language/abstract_equal_test.dart b/tests/language/abstract/equal_test.dart
similarity index 100%
rename from tests/language/abstract_equal_test.dart
rename to tests/language/abstract/equal_test.dart
diff --git a/tests/language/abstract_exact_selector_test.dart b/tests/language/abstract/exact_selector_test.dart
similarity index 100%
rename from tests/language/abstract_exact_selector_test.dart
rename to tests/language/abstract/exact_selector_test.dart
diff --git a/tests/language/abstract_factory_constructor_test.dart b/tests/language/abstract/factory_constructor_test.dart
similarity index 100%
rename from tests/language/abstract_factory_constructor_test.dart
rename to tests/language/abstract/factory_constructor_test.dart
diff --git a/tests/language/abstract_getter2_test.dart b/tests/language/abstract/getter2_test.dart
similarity index 100%
rename from tests/language/abstract_getter2_test.dart
rename to tests/language/abstract/getter2_test.dart
diff --git a/tests/language/abstract_getter_test.dart b/tests/language/abstract/getter_test.dart
similarity index 100%
rename from tests/language/abstract_getter_test.dart
rename to tests/language/abstract/getter_test.dart
diff --git a/tests/language/abstract_method_test.dart b/tests/language/abstract/method_test.dart
similarity index 100%
rename from tests/language/abstract_method_test.dart
rename to tests/language/abstract/method_test.dart
diff --git a/tests/language/abstract_object_method_test.dart b/tests/language/abstract/object_method_test.dart
similarity index 100%
rename from tests/language/abstract_object_method_test.dart
rename to tests/language/abstract/object_method_test.dart
diff --git a/tests/language/abstract_override_adds_optional_args_concrete_subclass_test.dart b/tests/language/abstract/override_adds_optional_args_concrete_subclass_test.dart
similarity index 100%
rename from tests/language/abstract_override_adds_optional_args_concrete_subclass_test.dart
rename to tests/language/abstract/override_adds_optional_args_concrete_subclass_test.dart
diff --git a/tests/language/abstract_override_adds_optional_args_concrete_test.dart b/tests/language/abstract/override_adds_optional_args_concrete_test.dart
similarity index 100%
rename from tests/language/abstract_override_adds_optional_args_concrete_test.dart
rename to tests/language/abstract/override_adds_optional_args_concrete_test.dart
diff --git a/tests/language/abstract_override_adds_optional_args_supercall_test.dart b/tests/language/abstract/override_adds_optional_args_supercall_test.dart
similarity index 100%
rename from tests/language/abstract_override_adds_optional_args_supercall_test.dart
rename to tests/language/abstract/override_adds_optional_args_supercall_test.dart
diff --git a/tests/language/abstract_override_adds_optional_args_test.dart b/tests/language/abstract/override_adds_optional_args_test.dart
similarity index 100%
rename from tests/language/abstract_override_adds_optional_args_test.dart
rename to tests/language/abstract/override_adds_optional_args_test.dart
diff --git a/tests/language/abstract_syntax_test.dart b/tests/language/abstract/syntax_test.dart
similarity index 100%
rename from tests/language/abstract_syntax_test.dart
rename to tests/language/abstract/syntax_test.dart
diff --git a/tests/language/language.status b/tests/language/language.status
index 796193b4ae2..79444306422 100644
--- a/tests/language/language.status
+++ b/tests/language/language.status
@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 [ $compiler != dart2analyzer ]
-switch_case_warn_test: Skip # Analyzer only, see language_analyzer2.status
+switch/case_warn_test: Skip # Analyzer only, see language_analyzer2.status
 
 [ $compiler != fasta ]
 nonfunction_type_aliases/*: Skip # github.com/dart-lang/language/issues/115
@@ -19,28 +19,28 @@ mixin_declaration/*: Skip # See https://github.com/dart-lang/language/issues/7
 void/*: Skip # https://github.com/dart-lang/sdk/issues/34015
 
 [ $mode == debug ]
-large_class_declaration_test: Slow
+class/large_class_declaration_test: Slow
 
 [ $mode == product ]
-assertion_test: SkipByDesign # Requires checked mode.
-generic_test: SkipByDesign # Requires checked mode.
-issue13474_test: SkipByDesign # Requires checked mode.
-map_literal4_test: SkipByDesign # Requires checked mode.
-named_parameters_type_test/01: SkipByDesign # Requires checked mode.
-named_parameters_type_test/02: SkipByDesign # Requires checked mode.
-named_parameters_type_test/03: SkipByDesign # Requires checked mode.
-positional_parameters_type_test/01: SkipByDesign # Requires checked mode.
-positional_parameters_type_test/02: SkipByDesign # Requires checked mode.
-regress_29784_test/02: SkipByDesign # Requires checked mode.
-stacktrace_demangle_ctors_test: SkipByDesign # Names are not scrubbed.
-type_checks_in_factory_method_test: SkipByDesign # Requires checked mode.
+assert/assert_test: SkipByDesign # Requires checked mode.
+generic/generic_test: SkipByDesign # Requires checked mode.
+map/literal4_test: SkipByDesign # Requires checked mode.
+parameter/named_type_test/01: SkipByDesign # Requires checked mode.
+parameter/named_type_test/02: SkipByDesign # Requires checked mode.
+parameter/named_type_test/03: SkipByDesign # Requires checked mode.
+parameter/positional_type_test/01: SkipByDesign # Requires checked mode.
+parameter/positional_type_test/02: SkipByDesign # Requires checked mode.
+regress/regress13474_test: SkipByDesign # Requires checked mode.
+regress/regress29784_test/02: SkipByDesign # Requires checked mode.
+stack_trace/demangle_ctors_test: SkipByDesign # Names are not scrubbed.
+type/checks_in_factory_method_test: SkipByDesign # Requires checked mode.
 
 [ $compiler != dart2js && $compiler != dartdevc && !$checked ]
 function_type/*: Skip # Needs checked mode.
 
 [ $compiler != dartk && $compiler != dartkb && $compiler != dartkp && $mode == debug && $runtime == vm ]
-built_in_identifier_type_annotation_test/set: Crash # Not supported by legacy VM front-end.
+identifier/built_in_type_annotation_test/set: Crash # Not supported by legacy VM front-end.
 
 [ $hot_reload || $hot_reload_rollback ]
-issue_22780_test/01: Crash # Issue 29094
+regress/regress22780_test/01: Crash # Issue 29094
 vm/optimized_stacktrace_test: Slow
diff --git a/tests/language/language_analyzer.status b/tests/language/language_analyzer.status
index 372d94b228c..23eabf4c580 100644
--- a/tests/language/language_analyzer.status
+++ b/tests/language/language_analyzer.status
@@ -5,7 +5,7 @@
 # Sections in this file should contain "$compiler == dart2analyzer".
 
 [ $compiler == dart2analyzer ]
-large_class_declaration_test: Slow
+class/large_class_declaration_test: Slow
 vm/debug_break_enabled_vm_test: Skip
 vm/debug_break_vm_test/*: Skip
 vm/regress_27201_test: SkipByDesign # Loads bad library, so will always crash.
diff --git a/tests/language/language_dart2js.status b/tests/language/language_dart2js.status
index 64bc2b8257e..5bdb44427e5 100644
--- a/tests/language/language_dart2js.status
+++ b/tests/language/language_dart2js.status
@@ -5,10 +5,11 @@
 
 [ $compiler == dart2js ]
 mixin_method_override_test/G5: Skip # Issue 34354
+number/int64_literal_runtime*_test: Skip # This is testing Dart 2.0 int64 semantics
 vm/*: SkipByDesign # Tests for the VM.
 
 [ $compiler != dart2js ]
-minify_closure_variable_collision_test: SkipByDesign # Regression test for dart2js
+closure/minify_closure_variable_collision_test: SkipByDesign # Regression test for dart2js
 
 [ $builder_tag == dart2js_production && $compiler == dart2js ]
 control_flow_collections/for_non_bool_condition_test: Crash # Issue 36442
@@ -17,15 +18,14 @@ control_flow_collections/for_non_bool_condition_test: Crash # Issue 36442
 override_field_test/02: Slow # TODO(kasperl): Please triage.
 
 [ $compiler == dart2js && $runtime == d8 ]
-conditional_import_string_test: SkipByDesign # No XHR in d8
-conditional_import_test: SkipByDesign # No XHR in d8
+import/conditional_string_test: SkipByDesign # No XHR in d8
+import/conditional_test: SkipByDesign # No XHR in d8
 
 [ $compiler == dart2js && $runtime == jsshell ]
-await_for_test: Skip # Jsshell does not provide periodic timers, Issue 7728
+await/for_test: Skip # Jsshell does not provide periodic timers, Issue 7728
 
 [ $compiler == dart2js && $system == windows ]
-canonicalization_hashing_memoize_array_test: Skip # Issue 37631
-canonicalization_hashing_memoize_instance_test: Skip # Issue 37631
-canonicalization_hashing_shallow_collision_array_test: Skip # Issue 37631
-canonicalization_hashing_shallow_collision_instance_test: Skip # Issue 37631
-
+canonicalize/hashing_memoize_array_test: Skip # Issue 37631
+canonicalize/hashing_memoize_instance_test: Skip # Issue 37631
+canonicalize/hashing_shallow_collision_array_test: Skip # Issue 37631
+canonicalize/hashing_shallow_collision_instance_test: Skip # Issue 37631
diff --git a/tests/language/language_dartdevc.status b/tests/language/language_dartdevc.status
index 1aed49bae0c..f94dbaafc78 100644
--- a/tests/language/language_dartdevc.status
+++ b/tests/language/language_dartdevc.status
@@ -4,20 +4,20 @@
 
 # Sections in this file should contain "$compiler == dartdevc" or dartdevk.
 [ $compiler == dartdevc ]
-const_double_in_int_op_test/dd6: Skip # Triple shift
-const_double_in_int_op_test/di6: Skip # Triple shift
-const_double_in_int_op_test/id6: Skip # Triple shift
-const_double_in_int_op_test/ii6: Skip # Triple shift
+class/large_class_declaration_test: Slow
+const/double_in_int_op_test/dd6: Skip # Triple shift
+const/double_in_int_op_test/di6: Skip # Triple shift
+const/double_in_int_op_test/id6: Skip # Triple shift
+const/double_in_int_op_test/ii6: Skip # Triple shift
 extension_methods/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing extension methods.
-large_class_declaration_test: Slow
 nnbd/*: Skip
 variance/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing variance.
 
 [ $compiler == dartdevk && !$checked ]
-assertion_initializer_const_error2_test/*: SkipByDesign # DDC does not support non-checked mode.
+assert/initializer_const_error2_test/*: SkipByDesign # DDC does not support non-checked mode.
 
 [ $compiler == dartdevc || $compiler == dartdevk ]
-asyncstar_throw_in_catch_test: Skip # Times out. Issue 29920
-int64_literal_test/*: Skip # This is testing Dart 2.0 int64 semantics.
+async_star/throw_in_catch_test: Skip # Times out. Issue 29920
+number/int64_literal_runtime*_test: Skip # This is testing Dart 2.0 int64 semantics.
 superinterface_variance/*: Skip # Issue dart-lang/language#113
 vm/*: SkipByDesign # VM only tests.; VM only tests.
diff --git a/tests/language/language_kernel.status b/tests/language/language_kernel.status
index 9b431342e54..3910863ec15 100644
--- a/tests/language/language_kernel.status
+++ b/tests/language/language_kernel.status
@@ -4,17 +4,17 @@
 
 
 [ $compiler == app_jitk ]
-no_main_test/01: Crash
+main/no_main_test/01: Crash
+number/web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 vm/regress_27671_test: SkipByDesign # Relies on string comparison of exception message which may return '<optimized out>'
-web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $compiler == dartkp ]
-web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
+number/web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $compiler == fasta ]
-async_await_syntax_test/e5: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
-async_await_syntax_test/e6: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
-web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
+async/await_syntax_test/e5: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
+async/await_syntax_test/e6: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
+number/web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $fasta ]
 nnbd/*: Skip
@@ -33,15 +33,15 @@ superinterface_variance/mixin_error_test/47: Crash # Issue dart-lang/language#11
 superinterface_variance/mixin_error_test/48: Crash # Issue dart-lang/language#113
 
 [ $builder_tag == obfuscated && $compiler == dartkp ]
-generic_function_dcall_test/01: SkipByDesign # Prints type names
-many_named_arguments_test: SkipByDesign # Checks names of arguments
-mixin_generic_test: SkipByDesign # Prints type names
-mixin_mixin3_test: SkipByDesign # Prints type names
-mixin_mixin5_test: SkipByDesign # Prints type names
-mixin_mixin6_test: SkipByDesign # Prints type names
-mixin_mixin_bound2_test: SkipByDesign # Prints type names
-symbol_literal_test/02: SkipByDesign # We don't obfuscate const Symbol constructor
-type_literal_test: SkipByDesign # Uses lots of strings with type names in them
+generic/function_dcall_test/01: SkipByDesign # Prints type names
+mixin/generic_test: SkipByDesign # Prints type names
+mixin/mixin3_test: SkipByDesign # Prints type names
+mixin/mixin5_test: SkipByDesign # Prints type names
+mixin/mixin6_test: SkipByDesign # Prints type names
+mixin/mixin_bound2_test: SkipByDesign # Prints type names
+type_object/literal_test: SkipByDesign # Uses lots of strings with type names in them
+unsorted/many_named_arguments_test: SkipByDesign # Checks names of arguments
+unsorted/symbol_literal_test/02: SkipByDesign # We don't obfuscate const Symbol constructor
 vm/bool_check_stack_traces_test: SkipByDesign # Looks for filenames in stacktrace output
 vm/no_such_args_error_message_vm_test: SkipByDesign # Looks for function name in error message
 vm/no_such_method_error_message_callable_vm_test: SkipByDesign # Expects unobfuscated method names
@@ -49,44 +49,44 @@ vm/no_such_method_error_message_vm_test: SkipByDesign # Looks for unobfuscated n
 vm/regress_28325_test: SkipByDesign # Looks for filename in stack trace
 
 [ $compiler == dartk && $mode == debug && ($hot_reload || $hot_reload_rollback) ]
-inference_enum_list_test: Skip # Issue 35885
+unsorted/inference_enum_list_test: Skip # Issue 35885
 
 [ $compiler == dartkp && $mode == debug && $runtime == dart_precompiled ]
 vm/precompiled_static_initializer_test: Slow
 
 # ==== dartkp + dart_precompiled status lines ====
 [ $compiler == dartkp && $runtime == dart_precompiled ]
-assert_with_type_test_or_cast_test: Crash
-const_evaluation_test: SkipByDesign
-ct_const2_test: Skip # Incompatible flag: --compile_all
-deferred_redirecting_factory_test: Crash # Issue 23408, KernelVM bug: Deferred loading kernel issue 30273.
-deopt_inlined_function_lazy_test: Skip # Incompatible flag: --deoptimize-alot
-enum_mirror_test: SkipByDesign
-export_ambiguous_main_test: Skip # Issue 29895 Fail Issue 14763
-export_double_same_main_test: Skip # Issue 29895 Crash Issue 29895
-field_increment_bailout_test: SkipByDesign
+assert/with_type_test_or_cast_test: Crash
+closure/implicit_test: Skip # Incompatible flag: --use_slow_path
+const/const2_test: Skip # Incompatible flag: --compile_all
+const/evaluation_test: SkipByDesign
+deferred/redirecting_factory_test: Crash # Issue 23408, KernelVM bug: Deferred loading kernel issue 30273.
+enum/mirror_test: SkipByDesign
+export/ambiguous_main_test: Skip # Issue 29895 Fail Issue 14763
+export/double_same_main_test: Skip # Issue 29895 Crash Issue 29895
+field/increment_bailout_test: SkipByDesign
 generic_methods_recursive_bound_test/03: Crash
-hello_dart_test: Skip # Incompatible flag: --compile_all
-implicit_closure_test: Skip # Incompatible flag: --use_slow_path
-instance_creation_in_function_annotation_test: SkipByDesign
-invocation_mirror2_test: SkipByDesign
-invocation_mirror_invoke_on2_test: SkipByDesign
-invocation_mirror_invoke_on_test: SkipByDesign
-issue21079_test: SkipByDesign
-main_not_a_function_test: Skip
-many_overridden_no_such_method_test: SkipByDesign
-mixin_illegal_super_use_test: Skip # Issues 24478 and 23773
-mixin_illegal_superclass_test: Skip # Issues 24478 and 23773
-no_main_test/01: Skip
-no_such_method_test: SkipByDesign
+instance/creation_in_function_annotation_test: SkipByDesign
+main/no_main_test/01: Skip
+main/not_a_function_test: Skip
+mixin/illegal_super_use_test: Skip # Issues 24478 and 23773
+mixin/illegal_superclass_test: Skip # Issues 24478 and 23773
+no_such_method/many_overridden_test.dart: SkipByDesign
+no_such_method/overridden_test: SkipByDesign
+no_such_method/test: SkipByDesign
 null_test/mirrors: Skip # Uses mirrors.
 null_test/none: SkipByDesign
-overridden_no_such_method_test: SkipByDesign
-redirecting_factory_reflection_test: SkipByDesign
-regress_13462_0_test: SkipByDesign
-regress_13462_1_test: SkipByDesign
-regress_18535_test: SkipByDesign
-regress_28255_test: SkipByDesign
+optimize/deopt_inlined_function_lazy_test: Skip # Incompatible flag: --deoptimize-alot
+redirecting/factory_reflection_test: SkipByDesign
+regress/regress13462_0_test: SkipByDesign
+regress/regress13462_1_test: SkipByDesign
+regress/regress18535_test: SkipByDesign
+regress/regress21079_test: SkipByDesign
+regress/regress28255_test: SkipByDesign
+unsorted/hello_dart_test: Skip # Incompatible flag: --compile_all
+unsorted/invocation_mirror2_test: SkipByDesign
+unsorted/invocation_mirror_invoke_on2_test: SkipByDesign
+unsorted/invocation_mirror_invoke_on_test: SkipByDesign
 vm/causal_async_exception_stack2_test: SkipByDesign
 vm/causal_async_exception_stack_test: SkipByDesign
 vm/closure_memory_retention_test: Skip # KernelVM bug: Hits OOM
@@ -95,33 +95,33 @@ vm/regress_27671_test: Skip # Unsupported
 vm/regress_29145_test: Skip # Issue 29145
 
 [ $compiler == dartkp && $runtime == dart_precompiled && $checked ]
-assertion_initializer_const_error2_test/cc01: Crash
-assertion_initializer_const_error2_test/cc02: Crash
-assertion_initializer_const_error2_test/cc03: Crash
-assertion_initializer_const_error2_test/cc04: Crash
-assertion_initializer_const_error2_test/cc05: Crash
-assertion_initializer_const_error2_test/cc06: Crash
-assertion_initializer_const_error2_test/cc07: Crash
-assertion_initializer_const_error2_test/cc08: Crash
-assertion_initializer_const_error2_test/cc09: Crash
-assertion_initializer_const_error2_test/cc10: Crash
-assertion_initializer_const_error2_test/cc11: Crash
+assert/initializer_const_error2_test/cc01: Crash
+assert/initializer_const_error2_test/cc02: Crash
+assert/initializer_const_error2_test/cc03: Crash
+assert/initializer_const_error2_test/cc04: Crash
+assert/initializer_const_error2_test/cc05: Crash
+assert/initializer_const_error2_test/cc06: Crash
+assert/initializer_const_error2_test/cc07: Crash
+assert/initializer_const_error2_test/cc08: Crash
+assert/initializer_const_error2_test/cc09: Crash
+assert/initializer_const_error2_test/cc10: Crash
+assert/initializer_const_error2_test/cc11: Crash
 
 [ $compiler == dartkp && $system == windows ]
-disassemble_test: Slow
+unsorted/disassemble_test: Slow
 
 [ $mode == debug && $runtime == vm && ($compiler == app_jitk || $compiler == dartk || $compiler == dartkb) ]
-deopt_inlined_function_lazy_test: Skip
+optimize/deopt_inlined_function_lazy_test: Skip
 
 [ $mode == debug && $hot_reload && ($compiler == dartk || $compiler == dartkb) ]
-async_star_test/01: Crash
-async_star_test/05: Crash
+async_star/async_star2_test/01: Crash
+async_star/async_star2_test/05: Crash
 
 [ $mode == debug && ($compiler == dartk || $compiler == dartkb) && ($hot_reload || $hot_reload_rollback) ]
-enum_duplicate_test/02: Crash # Issue 34606
-enum_duplicate_test/none: Crash # Issue 34606
-enum_private_test/01: Crash # Issue 34606
-enum_test: Crash # Issue 34606
+enum/duplicate_test/02: Crash # Issue 34606
+enum/duplicate_test/none: Crash # Issue 34606
+enum/private_test/01: Crash # Issue 34606
+enum/test: Crash # Issue 34606
 
 [ $mode == product && $runtime == vm && ($compiler == dartk || $compiler == dartkb) ]
 vm/causal_async_exception_stack2_test: SkipByDesign
@@ -129,24 +129,23 @@ vm/causal_async_exception_stack_test: SkipByDesign
 
 # ===== dartk + vm status lines =====
 [ $runtime == vm && ($compiler == dartk || $compiler == dartkb) ]
-ct_const2_test: Crash # Flaky
-disassemble_test: Slow, Crash # dartbug.com/34971
-mixin_illegal_super_use_test: Skip # Issues 24478 and 23773
-mixin_illegal_superclass_test: Skip # Issues 24478 and 23773
-no_main_test/01: Skip
+const/const2_test: Crash # Flaky
+main/no_main_test/01: Skip
+mixin/illegal_super_use_test: Skip # Issues 24478 and 23773
+mixin/illegal_superclass_test: Skip # Issues 24478 and 23773
+unsorted/disassemble_test: Slow, Crash # dartbug.com/34971
 vm/closure_memory_retention_test: Skip # KernelVM bug: Hits OOM
 vm/regress_29145_test: Skip # Issue 29145
 web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $hot_reload_rollback && ($compiler == dartk || $compiler == dartkb) ]
-symbol_conflict_test: Slow
+symbol/conflict_test: Slow
 
 [ ($compiler == dartk || $compiler == dartkb) && ($hot_reload || $hot_reload_rollback) ]
-async_star_test/01: Skip # Timeout
-async_star_test/02: Skip # Timeout
-async_star_test/03: Skip # Timeout
-async_star_test/04: Skip # Timeout
-async_star_test/05: Skip # Timeout
-async_star_test/none: Skip # Timeout
+async_star/async_star2_test/01: Skip # Timeout
+async_star/async_star2_test/02: Skip # Timeout
+async_star/async_star2_test/03: Skip # Timeout
+async_star/async_star2_test/04: Skip # Timeout
+async_star/async_star2_test/05: Skip # Timeout
+async_star/async_star2_test/none: Skip # Timeout
 type_constants_test/none: Skip # Deferred libraries and hot reload.
-
diff --git a/tests/language/language_precompiled.status b/tests/language/language_precompiled.status
index d7e999b0bb5..3100f764443 100644
--- a/tests/language/language_precompiled.status
+++ b/tests/language/language_precompiled.status
@@ -4,14 +4,14 @@
 # Sections in this file should start with "$runtime == dart_precompiled".
 
 [ $arch == arm64 && $runtime == dart_precompiled ]
-large_class_declaration_test: SkipSlow # Uses too much memory.
-setter4_test: MissingCompileTimeError
+class/large_class_declaration_test: SkipSlow # Uses too much memory.
+setter/setter4_test: MissingCompileTimeError
 
 [ $arch == ia32 && $runtime == dart_precompiled ]
 vm/regress_24517_test: Pass, Fail # Issue 24517.
 
 [ $compiler != dart2analyzer && $runtime == dart_precompiled ]
-mixin_mixin2_test: Skip
+mixin/mixin2_test: Skip
 
 [ $compiler == dartkp && $runtime == dart_precompiled ]
 async_star/async_star_await_for_test: RuntimeError
@@ -19,26 +19,26 @@ async_star/async_star_cancel_test: RuntimeError
 async_star/async_star_test: RuntimeError
 
 [ $runtime == dart_precompiled && $minified ]
-cyclic_type_test/*: Skip
-enum_duplicate_test/*: Skip # Uses Enum.toString()
-enum_private_test/*: Skip # Uses Enum.toString()
-enum_test: Skip # Uses Enum.toString()
-full_stacktrace1_test: Skip
-full_stacktrace2_test: Skip
-full_stacktrace3_test: Skip
-mixin_generic_test: Skip
-mixin_mixin3_test: Skip
-mixin_mixin5_test: Skip
-mixin_mixin6_test: Skip
-mixin_mixin_bound2_test: Skip
-mixin_mixin_type_arguments_test: Skip
-mixin_super_2_test: Skip
-no_such_method_dispatcher_test: Skip # Uses new Symbol()
+enum/duplicate_test/*: Skip # Uses Enum.toString()
+enum/enum_test: Skip # Uses Enum.toString()
+enum/private_test/*: Skip # Uses Enum.toString()
+mixin/generic_test: Skip
+mixin/mixin3_test: Skip
+mixin/mixin5_test: Skip
+mixin/mixin6_test: Skip
+mixin/mixin_bound2_test: Skip
+mixin/mixin_type_arguments_test: Skip
+mixin/super_2_test: Skip
+no_such_method/dispatcher_test: Skip # Uses new Symbol()
+stack_trace/full1_test: Skip
+stack_trace/full2_test: Skip
+stack_trace/full3_test: Skip
+unsorted/cyclic_type_test/*: Skip
 vm/no_such_args_error_message_vm_test: Skip
 vm/no_such_method_error_message_callable_vm_test: Skip
 vm/no_such_method_error_message_vm_test: Skip
 vm/regress_28325_test: Skip
 
 [ $runtime == dart_precompiled && ($mode == product || $minified) ]
-stacktrace_rethrow_error_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
-stacktrace_rethrow_nonerror_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
+stack_trace/rethrow_error_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
+stack_trace/rethrow_nonerror_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
diff --git a/tests/language/language_spec_parser.status b/tests/language/language_spec_parser.status
index 8ba505126c0..6b5318d7ca3 100644
--- a/tests/language/language_spec_parser.status
+++ b/tests/language/language_spec_parser.status
@@ -3,16 +3,16 @@
 # BSD-style license that can be found in the LICENSE file.
 
 [ $compiler == spec_parser ]
-built_in_identifier_prefix_test: Skip # A built-in identifier can _not_ be a prefix.
-closure_type_test: Pass # Marked as RuntimeError for all in language_2.status.
-const_native_factory_test: Skip # Uses `native`.
-deep_nesting_expression_test: Skip # JVM stack overflow.
-deep_nesting_statement_test: Skip # JVM stack overflow.
-double_invalid_test: Skip # Contains illegaly formatted double.
-issue_1751477_test: Skip # Times out: 9 levels, exponential blowup => 430 secs.
-large_class_declaration_test: Skip # JVM stack overflow.
+class/large_class_declaration_test: Skip # JVM stack overflow.
+closure/type_test: Pass # Marked as RuntimeError for all in language_2.status.
+const/native_factory_test: Skip # Uses `native`.
+double/invalid_test: Skip # Contains illegaly formatted double.
+identifier/built_in_prefix_test: Skip # A built-in identifier can _not_ be a prefix.
 nnbd/syntax/opt_out_nnbd_modifiers_test: Skip # Requires opt-out of NNBD.
 nnbd/syntax/pre_nnbd_modifiers_test: Skip # Requires opt-out of NNBD.
+regress/regress1751477_test: Skip # Times out: 9 levels, exponential blowup => 430 secs.
+syntax/deep_nesting_expression_test: Skip # JVM stack overflow.
+syntax/deep_nesting_statement_test: Skip # JVM stack overflow.
 variance: Skip # Not yet supported.
 vm/debug_break_enabled_vm_test/01: Fail # Uses debug break.
 vm/debug_break_enabled_vm_test/none: Fail # Uses debug break.
diff --git a/tests/language/language_vm.status b/tests/language/language_vm.status
index ceb8ec6c591..2d01341af25 100644
--- a/tests/language/language_vm.status
+++ b/tests/language/language_vm.status
@@ -4,17 +4,17 @@
 # Sections in this file should contain "$runtime == vm".
 
 [ $compiler == dartkp ]
-assertion_initializer_const_error2_test/cc01: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc02: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc03: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc04: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc05: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc06: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc07: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc08: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc09: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc10: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc11: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc01: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc02: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc03: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc04: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc05: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc06: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc07: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc08: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc09: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc10: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc11: MissingCompileTimeError # Not reporting failed assert() at compile time.
 
 [ $runtime == vm ]
 async_star/async_star_await_for_test: RuntimeError
@@ -22,11 +22,11 @@ async_star/async_star_cancel_test: RuntimeError
 async_star/async_star_test: RuntimeError
 
 [ $arch == arm64 && $runtime == vm ]
-closure_cycles_test: Pass, Slow
-large_class_declaration_test: SkipSlow # Uses too much memory.
+class/large_class_declaration_test: SkipSlow # Uses too much memory.
+closure/cycles_test: Pass, Slow
 
 [ $arch == ia32 && $mode == release && $runtime == vm ]
-deep_nesting_expression_test/01: Crash, Pass # Issue 31496
+syntax/deep_nesting_expression_test/01: Crash, Pass # Issue 31496
 
 [ $runtime == dart_precompiled || $runtime == vm ]
 superinterface_variance/*: Skip # Issue dart-lang/language#113
diff --git a/tests/language/aborting_switch_case_test.dart b/tests/language/switch/aborting_switch_case_test.dart
similarity index 100%
rename from tests/language/aborting_switch_case_test.dart
rename to tests/language/switch/aborting_switch_case_test.dart
diff --git a/tests/language_2/abstract_beats_arguments_test.dart b/tests/language_2/abstract/beats_arguments_test.dart
similarity index 100%
rename from tests/language_2/abstract_beats_arguments_test.dart
rename to tests/language_2/abstract/beats_arguments_test.dart
diff --git a/tests/language_2/abstract_equal_test.dart b/tests/language_2/abstract/equal_test.dart
similarity index 100%
rename from tests/language_2/abstract_equal_test.dart
rename to tests/language_2/abstract/equal_test.dart
diff --git a/tests/language_2/abstract_exact_selector_runtime_test.dart b/tests/language_2/abstract/exact_selector_runtime_test.dart
similarity index 96%
rename from tests/language_2/abstract_exact_selector_runtime_test.dart
rename to tests/language_2/abstract/exact_selector_runtime_test.dart
index d13fbfee9c9..ce380371176 100644
--- a/tests/language_2/abstract_exact_selector_runtime_test.dart
+++ b/tests/language_2/abstract/exact_selector_runtime_test.dart
@@ -9,7 +9,7 @@
 // methods to handle `noSuchMethod`.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 
     class Foo {
diff --git a/tests/language_2/abstract_exact_selector_test.dart b/tests/language_2/abstract/exact_selector_test.dart
similarity index 96%
rename from tests/language_2/abstract_exact_selector_test.dart
rename to tests/language_2/abstract/exact_selector_test.dart
index 6aa06d865f7..b40ccb8e0ff 100644
--- a/tests/language_2/abstract_exact_selector_test.dart
+++ b/tests/language_2/abstract/exact_selector_test.dart
@@ -6,7 +6,7 @@
 // methods to handle `noSuchMethod`.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 abstract
     class Foo {
diff --git a/tests/language_2/abstract_factory_constructor_runtime_test.dart b/tests/language_2/abstract/factory_constructor_runtime_test.dart
similarity index 100%
rename from tests/language_2/abstract_factory_constructor_runtime_test.dart
rename to tests/language_2/abstract/factory_constructor_runtime_test.dart
diff --git a/tests/language_2/abstract_factory_constructor_test.dart b/tests/language_2/abstract/factory_constructor_test.dart
similarity index 100%
rename from tests/language_2/abstract_factory_constructor_test.dart
rename to tests/language_2/abstract/factory_constructor_test.dart
diff --git a/tests/language_2/abstract_getter2_test.dart b/tests/language_2/abstract/getter2_test.dart
similarity index 100%
rename from tests/language_2/abstract_getter2_test.dart
rename to tests/language_2/abstract/getter2_test.dart
diff --git a/tests/language_2/abstract_getter_test.dart b/tests/language_2/abstract/getter_test.dart
similarity index 100%
rename from tests/language_2/abstract_getter_test.dart
rename to tests/language_2/abstract/getter_test.dart
diff --git a/tests/language_2/abstract_method_test.dart b/tests/language_2/abstract/method_test.dart
similarity index 100%
rename from tests/language_2/abstract_method_test.dart
rename to tests/language_2/abstract/method_test.dart
diff --git a/tests/language_2/abstract_object_method_test.dart b/tests/language_2/abstract/object_method_test.dart
similarity index 100%
rename from tests/language_2/abstract_object_method_test.dart
rename to tests/language_2/abstract/object_method_test.dart
diff --git a/tests/language_2/abstract_override_adds_optional_args_concrete_subclass_test.dart b/tests/language_2/abstract/override_adds_optional_args_concrete_subclass_test.dart
similarity index 100%
rename from tests/language_2/abstract_override_adds_optional_args_concrete_subclass_test.dart
rename to tests/language_2/abstract/override_adds_optional_args_concrete_subclass_test.dart
diff --git a/tests/language_2/abstract_override_adds_optional_args_concrete_test.dart b/tests/language_2/abstract/override_adds_optional_args_concrete_test.dart
similarity index 100%
rename from tests/language_2/abstract_override_adds_optional_args_concrete_test.dart
rename to tests/language_2/abstract/override_adds_optional_args_concrete_test.dart
diff --git a/tests/language_2/abstract_override_adds_optional_args_supercall_test.dart b/tests/language_2/abstract/override_adds_optional_args_supercall_test.dart
similarity index 100%
rename from tests/language_2/abstract_override_adds_optional_args_supercall_test.dart
rename to tests/language_2/abstract/override_adds_optional_args_supercall_test.dart
diff --git a/tests/language_2/abstract_override_adds_optional_args_test.dart b/tests/language_2/abstract/override_adds_optional_args_test.dart
similarity index 100%
rename from tests/language_2/abstract_override_adds_optional_args_test.dart
rename to tests/language_2/abstract/override_adds_optional_args_test.dart
diff --git a/tests/language_2/abstract_syntax_runtime_test.dart b/tests/language_2/abstract/syntax_runtime_test.dart
similarity index 100%
rename from tests/language_2/abstract_syntax_runtime_test.dart
rename to tests/language_2/abstract/syntax_runtime_test.dart
diff --git a/tests/language_2/abstract_syntax_test.dart b/tests/language_2/abstract/syntax_test.dart
similarity index 100%
rename from tests/language_2/abstract_syntax_test.dart
rename to tests/language_2/abstract/syntax_test.dart
diff --git a/tests/language_2/export_order_helper1.dart b/tests/language_2/accessor_conflict/export2_helper.dart
similarity index 74%
rename from tests/language_2/export_order_helper1.dart
rename to tests/language_2/accessor_conflict/export2_helper.dart
index befb6f5d6df..78278214a6c 100644
--- a/tests/language_2/export_order_helper1.dart
+++ b/tests/language_2/accessor_conflict/export2_helper.dart
@@ -2,5 +2,5 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export 'export_order_test.dart';
-export 'export_order_helper2.dart' show z;
+export "setter.dart";
+export "getter.dart";
diff --git a/tests/language_2/accessor_conflict_export2_test.dart b/tests/language_2/accessor_conflict/export2_test.dart
similarity index 91%
rename from tests/language_2/accessor_conflict_export2_test.dart
rename to tests/language_2/accessor_conflict/export2_test.dart
index 725f8e0a6b0..58a1a771b34 100644
--- a/tests/language_2/accessor_conflict_export2_test.dart
+++ b/tests/language_2/accessor_conflict/export2_test.dart
@@ -8,7 +8,7 @@
 
 import "package:expect/expect.dart";
 
-import "accessor_conflict_export2_helper.dart";
+import "export2_helper.dart";
 
 main() {
   getValue = 123;
diff --git a/tests/language_2/accessor_conflict_export2_helper.dart b/tests/language_2/accessor_conflict/export_helper.dart
similarity index 73%
rename from tests/language_2/accessor_conflict_export2_helper.dart
rename to tests/language_2/accessor_conflict/export_helper.dart
index a6cf7e0a221..ef024375936 100644
--- a/tests/language_2/accessor_conflict_export2_helper.dart
+++ b/tests/language_2/accessor_conflict/export_helper.dart
@@ -2,5 +2,5 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export "accessor_conflict_setter.dart";
-export "accessor_conflict_getter.dart";
+export "getter.dart";
+export "setter.dart";
diff --git a/tests/language_2/accessor_conflict_export_test.dart b/tests/language_2/accessor_conflict/export_test.dart
similarity index 91%
rename from tests/language_2/accessor_conflict_export_test.dart
rename to tests/language_2/accessor_conflict/export_test.dart
index bac516c16d9..babde007887 100644
--- a/tests/language_2/accessor_conflict_export_test.dart
+++ b/tests/language_2/accessor_conflict/export_test.dart
@@ -8,7 +8,7 @@
 
 import "package:expect/expect.dart";
 
-import "accessor_conflict_export_helper.dart";
+import "export_helper.dart";
 
 main() {
   getValue = 123;
diff --git a/tests/language_2/accessor_conflict_getter.dart b/tests/language_2/accessor_conflict/getter.dart
similarity index 100%
rename from tests/language_2/accessor_conflict_getter.dart
rename to tests/language_2/accessor_conflict/getter.dart
diff --git a/tests/language_2/accessor_conflict_import2_test.dart b/tests/language_2/accessor_conflict/import2_test.dart
similarity index 86%
rename from tests/language_2/accessor_conflict_import2_test.dart
rename to tests/language_2/accessor_conflict/import2_test.dart
index 99a4007c9b0..874b3210aaf 100644
--- a/tests/language_2/accessor_conflict_import2_test.dart
+++ b/tests/language_2/accessor_conflict/import2_test.dart
@@ -7,8 +7,8 @@
 
 import "package:expect/expect.dart";
 
-import "accessor_conflict_setter.dart";
-import "accessor_conflict_getter.dart";
+import "setter.dart";
+import "getter.dart";
 
 main() {
   getValue = 123;
diff --git a/tests/language_2/accessor_conflict_import_prefixed2_test.dart b/tests/language_2/accessor_conflict/import_prefixed2_test.dart
similarity index 84%
rename from tests/language_2/accessor_conflict_import_prefixed2_test.dart
rename to tests/language_2/accessor_conflict/import_prefixed2_test.dart
index 88ab758cdb6..283decf07c1 100644
--- a/tests/language_2/accessor_conflict_import_prefixed2_test.dart
+++ b/tests/language_2/accessor_conflict/import_prefixed2_test.dart
@@ -7,8 +7,8 @@
 
 import "package:expect/expect.dart";
 
-import "accessor_conflict_setter.dart" as p;
-import "accessor_conflict_getter.dart" as p;
+import "setter.dart" as p;
+import "getter.dart" as p;
 
 main() {
   p.getValue = 123;
diff --git a/tests/language_2/accessor_conflict_import_prefixed_test.dart b/tests/language_2/accessor_conflict/import_prefixed_test.dart
similarity index 84%
rename from tests/language_2/accessor_conflict_import_prefixed_test.dart
rename to tests/language_2/accessor_conflict/import_prefixed_test.dart
index 0c286cb2740..fdb3ca85f86 100644
--- a/tests/language_2/accessor_conflict_import_prefixed_test.dart
+++ b/tests/language_2/accessor_conflict/import_prefixed_test.dart
@@ -7,8 +7,8 @@
 
 import "package:expect/expect.dart";
 
-import "accessor_conflict_getter.dart" as p;
-import "accessor_conflict_setter.dart" as p;
+import "getter.dart" as p;
+import "setter.dart" as p;
 
 main() {
   p.getValue = 123;
diff --git a/tests/language_2/accessor_conflict_import_test.dart b/tests/language_2/accessor_conflict/import_test.dart
similarity index 86%
rename from tests/language_2/accessor_conflict_import_test.dart
rename to tests/language_2/accessor_conflict/import_test.dart
index 0b485ceec68..49be4e5ae01 100644
--- a/tests/language_2/accessor_conflict_import_test.dart
+++ b/tests/language_2/accessor_conflict/import_test.dart
@@ -7,8 +7,8 @@
 
 import "package:expect/expect.dart";
 
-import "accessor_conflict_getter.dart";
-import "accessor_conflict_setter.dart";
+import "getter.dart";
+import "setter.dart";
 
 main() {
   getValue = 123;
diff --git a/tests/language_2/accessor_conflict_setter.dart b/tests/language_2/accessor_conflict/setter.dart
similarity index 100%
rename from tests/language_2/accessor_conflict_setter.dart
rename to tests/language_2/accessor_conflict/setter.dart
diff --git a/tests/language_2/accessor_conflict_export_helper.dart b/tests/language_2/accessor_conflict_export_helper.dart
deleted file mode 100644
index ff065eca870..00000000000
--- a/tests/language_2/accessor_conflict_export_helper.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-export "accessor_conflict_getter.dart";
-export "accessor_conflict_setter.dart";
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_1_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_1_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_1_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_2_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_2_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_2_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_3_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_3_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_3_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_4_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_4_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_4_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_5_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_5_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_5_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_6_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_6_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_6_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_7_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_7_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_7_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_runtime_test.dart b/tests/language_2/argument/assignability_function_typed_runtime_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_runtime_test.dart
rename to tests/language_2/argument/assignability_function_typed_runtime_test.dart
diff --git a/tests/language_2/argument_assignability_function_typed_test.dart b/tests/language_2/argument/assignability_function_typed_test.dart
similarity index 100%
rename from tests/language_2/argument_assignability_function_typed_test.dart
rename to tests/language_2/argument/assignability_function_typed_test.dart
diff --git a/tests/language_2/named_argument_test.dart b/tests/language_2/argument/named_argument_test.dart
similarity index 100%
rename from tests/language_2/named_argument_test.dart
rename to tests/language_2/argument/named_argument_test.dart
diff --git a/tests/language_2/named_argument_in_const_creation_test.dart b/tests/language_2/argument/named_in_const_creation_test.dart
similarity index 100%
rename from tests/language_2/named_argument_in_const_creation_test.dart
rename to tests/language_2/argument/named_in_const_creation_test.dart
diff --git a/tests/language_2/not_enough_positional_arguments_test.dart b/tests/language_2/argument/not_enough_positional_arguments_test.dart
similarity index 100%
rename from tests/language_2/not_enough_positional_arguments_test.dart
rename to tests/language_2/argument/not_enough_positional_arguments_test.dart
diff --git a/tests/language_2/not_enough_positional_arguments_runtime_test.dart b/tests/language_2/argument/not_enough_positional_runtime_test.dart
similarity index 100%
rename from tests/language_2/not_enough_positional_arguments_runtime_test.dart
rename to tests/language_2/argument/not_enough_positional_runtime_test.dart
diff --git a/tests/language_2/assertion_test.dart b/tests/language_2/assert/assert_test.dart
similarity index 100%
rename from tests/language_2/assertion_test.dart
rename to tests/language_2/assert/assert_test.dart
diff --git a/tests/language_2/assert_assignable_type_test.dart b/tests/language_2/assert/assignable_type_test.dart
similarity index 100%
rename from tests/language_2/assert_assignable_type_test.dart
rename to tests/language_2/assert/assignable_type_test.dart
diff --git a/tests/language_2/assertion_initializer_const_error2_runtime_test.dart b/tests/language_2/assert/initializer_const_error2_runtime_test.dart
similarity index 100%
rename from tests/language_2/assertion_initializer_const_error2_runtime_test.dart
rename to tests/language_2/assert/initializer_const_error2_runtime_test.dart
diff --git a/tests/language_2/assertion_initializer_const_error2_test.dart b/tests/language_2/assert/initializer_const_error2_test.dart
similarity index 100%
rename from tests/language_2/assertion_initializer_const_error2_test.dart
rename to tests/language_2/assert/initializer_const_error2_test.dart
diff --git a/tests/language_2/assertion_initializer_const_error_runtime_test.dart b/tests/language_2/assert/initializer_const_error_runtime_test.dart
similarity index 100%
rename from tests/language_2/assertion_initializer_const_error_runtime_test.dart
rename to tests/language_2/assert/initializer_const_error_runtime_test.dart
diff --git a/tests/language_2/assertion_initializer_const_error_test.dart b/tests/language_2/assert/initializer_const_error_test.dart
similarity index 100%
rename from tests/language_2/assertion_initializer_const_error_test.dart
rename to tests/language_2/assert/initializer_const_error_test.dart
diff --git a/tests/language_2/assertion_initializer_const_function_runtime_test.dart b/tests/language_2/assert/initializer_const_function_runtime_test.dart
similarity index 100%
rename from tests/language_2/assertion_initializer_const_function_runtime_test.dart
rename to tests/language_2/assert/initializer_const_function_runtime_test.dart
diff --git a/tests/language_2/assertion_initializer_const_function_test.dart b/tests/language_2/assert/initializer_const_function_test.dart
similarity index 100%
rename from tests/language_2/assertion_initializer_const_function_test.dart
rename to tests/language_2/assert/initializer_const_function_test.dart
diff --git a/tests/language_2/assertion_initializer_test.dart b/tests/language_2/assert/initializer_test.dart
similarity index 100%
rename from tests/language_2/assertion_initializer_test.dart
rename to tests/language_2/assert/initializer_test.dart
diff --git a/tests/language_2/assert_message_test.dart b/tests/language_2/assert/message_test.dart
similarity index 100%
rename from tests/language_2/assert_message_test.dart
rename to tests/language_2/assert/message_test.dart
diff --git a/tests/language_2/assert_trailing_comma_runtime_test.dart b/tests/language_2/assert/trailing_comma_runtime_test.dart
similarity index 100%
rename from tests/language_2/assert_trailing_comma_runtime_test.dart
rename to tests/language_2/assert/trailing_comma_runtime_test.dart
diff --git a/tests/language_2/assert_trailing_comma_test.dart b/tests/language_2/assert/trailing_comma_test.dart
similarity index 100%
rename from tests/language_2/assert_trailing_comma_test.dart
rename to tests/language_2/assert/trailing_comma_test.dart
diff --git a/tests/language_2/assert_with_message_test.dart b/tests/language_2/assert/with_message_test.dart
similarity index 100%
rename from tests/language_2/assert_with_message_test.dart
rename to tests/language_2/assert/with_message_test.dart
diff --git a/tests/language_2/assert_with_type_test_or_cast_test.dart b/tests/language_2/assert/with_type_test_or_cast_test.dart
similarity index 100%
rename from tests/language_2/assert_with_type_test_or_cast_test.dart
rename to tests/language_2/assert/with_type_test_or_cast_test.dart
diff --git a/tests/language_2/assign_instance_method_test.dart b/tests/language_2/assign/instance_method_test.dart
similarity index 100%
rename from tests/language_2/assign_instance_method_test.dart
rename to tests/language_2/assign/instance_method_test.dart
diff --git a/tests/language_2/assign_op_test.dart b/tests/language_2/assign/op_test.dart
similarity index 100%
rename from tests/language_2/assign_op_test.dart
rename to tests/language_2/assign/op_test.dart
diff --git a/tests/language_2/assign_static_type_runtime_test.dart b/tests/language_2/assign/static_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/assign_static_type_runtime_test.dart
rename to tests/language_2/assign/static_type_runtime_test.dart
diff --git a/tests/language_2/assign_static_type_test.dart b/tests/language_2/assign/static_type_test.dart
similarity index 100%
rename from tests/language_2/assign_static_type_test.dart
rename to tests/language_2/assign/static_type_test.dart
diff --git a/tests/language_2/assign_to_type_runtime_test.dart b/tests/language_2/assign/to_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/assign_to_type_runtime_test.dart
rename to tests/language_2/assign/to_type_runtime_test.dart
diff --git a/tests/language_2/assign_to_type_test.dart b/tests/language_2/assign/to_type_test.dart
similarity index 100%
rename from tests/language_2/assign_to_type_test.dart
rename to tests/language_2/assign/to_type_test.dart
diff --git a/tests/language_2/assign_top_method_test.dart b/tests/language_2/assign/top_method_test.dart
similarity index 100%
rename from tests/language_2/assign_top_method_test.dart
rename to tests/language_2/assign/top_method_test.dart
diff --git a/tests/language_2/async_and_or_test.dart b/tests/language_2/async/and_or_test.dart
similarity index 100%
rename from tests/language_2/async_and_or_test.dart
rename to tests/language_2/async/and_or_test.dart
diff --git a/tests/language_2/async_test.dart b/tests/language_2/async/async_test.dart
similarity index 100%
rename from tests/language_2/async_test.dart
rename to tests/language_2/async/async_test.dart
diff --git a/tests/language_2/async_await_catch_regression_test.dart b/tests/language_2/async/await_catch_regression_test.dart
similarity index 100%
rename from tests/language_2/async_await_catch_regression_test.dart
rename to tests/language_2/async/await_catch_regression_test.dart
diff --git a/tests/language_2/async_await_foreign_test.dart b/tests/language_2/async/await_foreign_test.dart
similarity index 100%
rename from tests/language_2/async_await_foreign_test.dart
rename to tests/language_2/async/await_foreign_test.dart
diff --git a/tests/language_2/async_await_syntax_test.dart b/tests/language_2/async/await_syntax_test.dart
similarity index 100%
rename from tests/language_2/async_await_syntax_test.dart
rename to tests/language_2/async/await_syntax_test.dart
diff --git a/tests/language_2/async_await_test.dart b/tests/language_2/async/await_test.dart
similarity index 100%
rename from tests/language_2/async_await_test.dart
rename to tests/language_2/async/await_test.dart
diff --git a/tests/language_2/async_backwards_compatibility_1_test.dart b/tests/language_2/async/backwards_compatibility_1_test.dart
similarity index 91%
rename from tests/language_2/async_backwards_compatibility_1_test.dart
rename to tests/language_2/async/backwards_compatibility_1_test.dart
index 474effe227b..b11fad52d88 100644
--- a/tests/language_2/async_backwards_compatibility_1_test.dart
+++ b/tests/language_2/async/backwards_compatibility_1_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
-import 'async_helper_lib.dart' as async;
+import 'helper_lib.dart' as async;
 
 class A {
   async.async get x => null;
diff --git a/tests/language_2/async_backwards_compatibility_2_test.dart b/tests/language_2/async/backwards_compatibility_2_test.dart
similarity index 100%
rename from tests/language_2/async_backwards_compatibility_2_test.dart
rename to tests/language_2/async/backwards_compatibility_2_test.dart
diff --git a/tests/language_2/async_break_in_finally_test.dart b/tests/language_2/async/break_in_finally_test.dart
similarity index 100%
rename from tests/language_2/async_break_in_finally_test.dart
rename to tests/language_2/async/break_in_finally_test.dart
diff --git a/tests/language_2/async_call_test.dart b/tests/language_2/async/call_test.dart
similarity index 100%
rename from tests/language_2/async_call_test.dart
rename to tests/language_2/async/call_test.dart
diff --git a/tests/language_2/async_cascade_test.dart b/tests/language_2/async/cascade_test.dart
similarity index 100%
rename from tests/language_2/async_cascade_test.dart
rename to tests/language_2/async/cascade_test.dart
diff --git a/tests/language_2/async_congruence_local_runtime_test.dart b/tests/language_2/async/congruence_local_runtime_test.dart
similarity index 100%
rename from tests/language_2/async_congruence_local_runtime_test.dart
rename to tests/language_2/async/congruence_local_runtime_test.dart
diff --git a/tests/language_2/async_congruence_local_test.dart b/tests/language_2/async/congruence_local_test.dart
similarity index 100%
rename from tests/language_2/async_congruence_local_test.dart
rename to tests/language_2/async/congruence_local_test.dart
diff --git a/tests/language_2/async_congruence_method_runtime_test.dart b/tests/language_2/async/congruence_method_runtime_test.dart
similarity index 100%
rename from tests/language_2/async_congruence_method_runtime_test.dart
rename to tests/language_2/async/congruence_method_runtime_test.dart
diff --git a/tests/language_2/async_congruence_method_test.dart b/tests/language_2/async/congruence_method_test.dart
similarity index 100%
rename from tests/language_2/async_congruence_method_test.dart
rename to tests/language_2/async/congruence_method_test.dart
diff --git a/tests/language_2/async_congruence_top_level_test.dart b/tests/language_2/async/congruence_top_level_test.dart
similarity index 100%
rename from tests/language_2/async_congruence_top_level_test.dart
rename to tests/language_2/async/congruence_top_level_test.dart
diff --git a/tests/language_2/async_congruence_unnamed_runtime_test.dart b/tests/language_2/async/congruence_unnamed_runtime_test.dart
similarity index 100%
rename from tests/language_2/async_congruence_unnamed_runtime_test.dart
rename to tests/language_2/async/congruence_unnamed_runtime_test.dart
diff --git a/tests/language_2/async_congruence_unnamed_test.dart b/tests/language_2/async/congruence_unnamed_test.dart
similarity index 100%
rename from tests/language_2/async_congruence_unnamed_test.dart
rename to tests/language_2/async/congruence_unnamed_test.dart
diff --git a/tests/language_2/async_continue_label_test.dart b/tests/language_2/async/continue_label_test.dart
similarity index 100%
rename from tests/language_2/async_continue_label_test.dart
rename to tests/language_2/async/continue_label_test.dart
diff --git a/tests/language_2/async_control_structures_test.dart b/tests/language_2/async/control_structures_test.dart
similarity index 100%
rename from tests/language_2/async_control_structures_test.dart
rename to tests/language_2/async/control_structures_test.dart
diff --git a/tests/language_2/async_covariant_type_test.dart b/tests/language_2/async/covariant_type_test.dart
similarity index 100%
rename from tests/language_2/async_covariant_type_test.dart
rename to tests/language_2/async/covariant_type_test.dart
diff --git a/tests/language_2/async_dcall_type_test.dart b/tests/language_2/async/dcall_type_test.dart
similarity index 100%
rename from tests/language_2/async_dcall_type_test.dart
rename to tests/language_2/async/dcall_type_test.dart
diff --git a/tests/language_2/async_error_timing_test.dart b/tests/language_2/async/error_timing_test.dart
similarity index 100%
rename from tests/language_2/async_error_timing_test.dart
rename to tests/language_2/async/error_timing_test.dart
diff --git a/tests/language_2/async_finally_rethrow_test.dart b/tests/language_2/async/finally_rethrow_test.dart
similarity index 100%
rename from tests/language_2/async_finally_rethrow_test.dart
rename to tests/language_2/async/finally_rethrow_test.dart
diff --git a/tests/language_2/async_helper_lib.dart b/tests/language_2/async/helper_lib.dart
similarity index 100%
rename from tests/language_2/async_helper_lib.dart
rename to tests/language_2/async/helper_lib.dart
diff --git a/tests/language_2/async_identifier_test.dart b/tests/language_2/async/identifier_test.dart
similarity index 97%
rename from tests/language_2/async_identifier_test.dart
rename to tests/language_2/async/identifier_test.dart
index 5af272253a7..a5d3f9de068 100644
--- a/tests/language_2/async_identifier_test.dart
+++ b/tests/language_2/async/identifier_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async' as async;
-import 'async_lib.dart' as l; // Minimal library containing "int async;".
+import 'lib.dart' as l; // Minimal library containing "int async;".
 
 // Adapted from Analyzer test testing where `async` was not previously allowed.
 
diff --git a/tests/language_2/async_lib.dart b/tests/language_2/async/lib.dart
similarity index 100%
rename from tests/language_2/async_lib.dart
rename to tests/language_2/async/lib.dart
diff --git a/tests/language_2/async_or_generator_return_type_stacktrace_runtime_test.dart b/tests/language_2/async/or_generator_return_type_stacktrace_runtime_test.dart
similarity index 100%
rename from tests/language_2/async_or_generator_return_type_stacktrace_runtime_test.dart
rename to tests/language_2/async/or_generator_return_type_stacktrace_runtime_test.dart
diff --git a/tests/language_2/async_or_generator_return_type_stacktrace_test.dart b/tests/language_2/async/or_generator_return_type_stacktrace_test.dart
similarity index 100%
rename from tests/language_2/async_or_generator_return_type_stacktrace_test.dart
rename to tests/language_2/async/or_generator_return_type_stacktrace_test.dart
diff --git a/tests/language_2/async_regression_23058_test.dart b/tests/language_2/async/regression_23058_test.dart
similarity index 100%
rename from tests/language_2/async_regression_23058_test.dart
rename to tests/language_2/async/regression_23058_test.dart
diff --git a/tests/language_2/async_rethrow_test.dart b/tests/language_2/async/rethrow_test.dart
similarity index 100%
rename from tests/language_2/async_rethrow_test.dart
rename to tests/language_2/async/rethrow_test.dart
diff --git a/tests/language_2/async_return_types_runtime_test.dart b/tests/language_2/async/return_types_runtime_test.dart
similarity index 100%
rename from tests/language_2/async_return_types_runtime_test.dart
rename to tests/language_2/async/return_types_runtime_test.dart
diff --git a/tests/language_2/async_return_types_test.dart b/tests/language_2/async/return_types_test.dart
similarity index 100%
rename from tests/language_2/async_return_types_test.dart
rename to tests/language_2/async/return_types_test.dart
diff --git a/tests/language_2/async_switch_test.dart b/tests/language_2/async/switch_test.dart
similarity index 100%
rename from tests/language_2/async_switch_test.dart
rename to tests/language_2/async/switch_test.dart
diff --git a/tests/language_2/async_this_bound_test.dart b/tests/language_2/async/this_bound_test.dart
similarity index 100%
rename from tests/language_2/async_this_bound_test.dart
rename to tests/language_2/async/this_bound_test.dart
diff --git a/tests/language_2/async_throw_in_catch_test.dart b/tests/language_2/async/throw_in_catch_test.dart
similarity index 100%
rename from tests/language_2/async_throw_in_catch_test.dart
rename to tests/language_2/async/throw_in_catch_test.dart
diff --git a/tests/language_2/async_nested_01_test.dart b/tests/language_2/async_nested/async_nested01_test.dart
similarity index 100%
rename from tests/language_2/async_nested_01_test.dart
rename to tests/language_2/async_nested/async_nested01_test.dart
diff --git a/tests/language_2/async_nested_02_test.dart b/tests/language_2/async_nested/async_nested02_test.dart
similarity index 100%
rename from tests/language_2/async_nested_02_test.dart
rename to tests/language_2/async_nested/async_nested02_test.dart
diff --git a/tests/language_2/async_nested_03_test.dart b/tests/language_2/async_nested/async_nested03_test.dart
similarity index 100%
rename from tests/language_2/async_nested_03_test.dart
rename to tests/language_2/async_nested/async_nested03_test.dart
diff --git a/tests/language_2/async_nested_04_test.dart b/tests/language_2/async_nested/async_nested04_test.dart
similarity index 100%
rename from tests/language_2/async_nested_04_test.dart
rename to tests/language_2/async_nested/async_nested04_test.dart
diff --git a/tests/language_2/async_nested_05_test.dart b/tests/language_2/async_nested/async_nested05_test.dart
similarity index 100%
rename from tests/language_2/async_nested_05_test.dart
rename to tests/language_2/async_nested/async_nested05_test.dart
diff --git a/tests/language_2/async_nested_06_test.dart b/tests/language_2/async_nested/async_nested06_test.dart
similarity index 100%
rename from tests/language_2/async_nested_06_test.dart
rename to tests/language_2/async_nested/async_nested06_test.dart
diff --git a/tests/language_2/async_nested_07_test.dart b/tests/language_2/async_nested/async_nested07_test.dart
similarity index 100%
rename from tests/language_2/async_nested_07_test.dart
rename to tests/language_2/async_nested/async_nested07_test.dart
diff --git a/tests/language_2/async_nested_08_test.dart b/tests/language_2/async_nested/async_nested08_test.dart
similarity index 100%
rename from tests/language_2/async_nested_08_test.dart
rename to tests/language_2/async_nested/async_nested08_test.dart
diff --git a/tests/language_2/async_nested_09_test.dart b/tests/language_2/async_nested/async_nested09_test.dart
similarity index 100%
rename from tests/language_2/async_nested_09_test.dart
rename to tests/language_2/async_nested/async_nested09_test.dart
diff --git a/tests/language_2/async_nested_10_test.dart b/tests/language_2/async_nested/async_nested10_test.dart
similarity index 100%
rename from tests/language_2/async_nested_10_test.dart
rename to tests/language_2/async_nested/async_nested10_test.dart
diff --git a/tests/language_2/async_nested_11_test.dart b/tests/language_2/async_nested/async_nested11_test.dart
similarity index 100%
rename from tests/language_2/async_nested_11_test.dart
rename to tests/language_2/async_nested/async_nested11_test.dart
diff --git a/tests/language_2/async_nested_12_test.dart b/tests/language_2/async_nested/async_nested12_test.dart
similarity index 100%
rename from tests/language_2/async_nested_12_test.dart
rename to tests/language_2/async_nested/async_nested12_test.dart
diff --git a/tests/language_2/async_nested_13_test.dart b/tests/language_2/async_nested/async_nested13_test.dart
similarity index 100%
rename from tests/language_2/async_nested_13_test.dart
rename to tests/language_2/async_nested/async_nested13_test.dart
diff --git a/tests/language_2/async_nested_14_test.dart b/tests/language_2/async_nested/async_nested14_test.dart
similarity index 100%
rename from tests/language_2/async_nested_14_test.dart
rename to tests/language_2/async_nested/async_nested14_test.dart
diff --git a/tests/language_2/async_nested_15_test.dart b/tests/language_2/async_nested/async_nested15_test.dart
similarity index 100%
rename from tests/language_2/async_nested_15_test.dart
rename to tests/language_2/async_nested/async_nested15_test.dart
diff --git a/tests/language_2/async_nested_16_test.dart b/tests/language_2/async_nested/async_nested16_test.dart
similarity index 100%
rename from tests/language_2/async_nested_16_test.dart
rename to tests/language_2/async_nested/async_nested16_test.dart
diff --git a/tests/language_2/async_nested_17_test.dart b/tests/language_2/async_nested/async_nested17_test.dart
similarity index 100%
rename from tests/language_2/async_nested_17_test.dart
rename to tests/language_2/async_nested/async_nested17_test.dart
diff --git a/tests/language_2/async_nested_18_test.dart b/tests/language_2/async_nested/async_nested18_test.dart
similarity index 100%
rename from tests/language_2/async_nested_18_test.dart
rename to tests/language_2/async_nested/async_nested18_test.dart
diff --git a/tests/language_2/async_nested_19_test.dart b/tests/language_2/async_nested/async_nested19_test.dart
similarity index 100%
rename from tests/language_2/async_nested_19_test.dart
rename to tests/language_2/async_nested/async_nested19_test.dart
diff --git a/tests/language_2/async_nested_20_test.dart b/tests/language_2/async_nested/async_nested20_test.dart
similarity index 100%
rename from tests/language_2/async_nested_20_test.dart
rename to tests/language_2/async_nested/async_nested20_test.dart
diff --git a/tests/language_2/async_nested_21_test.dart b/tests/language_2/async_nested/async_nested21_test.dart
similarity index 100%
rename from tests/language_2/async_nested_21_test.dart
rename to tests/language_2/async_nested/async_nested21_test.dart
diff --git a/tests/language_2/async_nested_22_test.dart b/tests/language_2/async_nested/async_nested22_test.dart
similarity index 100%
rename from tests/language_2/async_nested_22_test.dart
rename to tests/language_2/async_nested/async_nested22_test.dart
diff --git a/tests/language_2/async_nested_23_test.dart b/tests/language_2/async_nested/async_nested23_test.dart
similarity index 100%
rename from tests/language_2/async_nested_23_test.dart
rename to tests/language_2/async_nested/async_nested23_test.dart
diff --git a/tests/language_2/async_nested_24_test.dart b/tests/language_2/async_nested/async_nested24_test.dart
similarity index 100%
rename from tests/language_2/async_nested_24_test.dart
rename to tests/language_2/async_nested/async_nested24_test.dart
diff --git a/tests/language_2/async_nested_25_test.dart b/tests/language_2/async_nested/async_nested25_test.dart
similarity index 100%
rename from tests/language_2/async_nested_25_test.dart
rename to tests/language_2/async_nested/async_nested25_test.dart
diff --git a/tests/language_2/async_nested_26_test.dart b/tests/language_2/async_nested/async_nested26_test.dart
similarity index 100%
rename from tests/language_2/async_nested_26_test.dart
rename to tests/language_2/async_nested/async_nested26_test.dart
diff --git a/tests/language_2/async_nested_27_test.dart b/tests/language_2/async_nested/async_nested27_test.dart
similarity index 100%
rename from tests/language_2/async_nested_27_test.dart
rename to tests/language_2/async_nested/async_nested27_test.dart
diff --git a/tests/language_2/async_nested_28_test.dart b/tests/language_2/async_nested/async_nested28_test.dart
similarity index 100%
rename from tests/language_2/async_nested_28_test.dart
rename to tests/language_2/async_nested/async_nested28_test.dart
diff --git a/tests/language_2/async_nested_29_test.dart b/tests/language_2/async_nested/async_nested29_test.dart
similarity index 100%
rename from tests/language_2/async_nested_29_test.dart
rename to tests/language_2/async_nested/async_nested29_test.dart
diff --git a/tests/language_2/async_nested_30_test.dart b/tests/language_2/async_nested/async_nested30_test.dart
similarity index 100%
rename from tests/language_2/async_nested_30_test.dart
rename to tests/language_2/async_nested/async_nested30_test.dart
diff --git a/tests/language_2/async_nested_31_test.dart b/tests/language_2/async_nested/async_nested31_test.dart
similarity index 100%
rename from tests/language_2/async_nested_31_test.dart
rename to tests/language_2/async_nested/async_nested31_test.dart
diff --git a/tests/language_2/async_nested_32_test.dart b/tests/language_2/async_nested/async_nested32_test.dart
similarity index 100%
rename from tests/language_2/async_nested_32_test.dart
rename to tests/language_2/async_nested/async_nested32_test.dart
diff --git a/tests/language_2/async_nested_33_test.dart b/tests/language_2/async_nested/async_nested33_test.dart
similarity index 100%
rename from tests/language_2/async_nested_33_test.dart
rename to tests/language_2/async_nested/async_nested33_test.dart
diff --git a/tests/language_2/async_nested_34_test.dart b/tests/language_2/async_nested/async_nested34_test.dart
similarity index 100%
rename from tests/language_2/async_nested_34_test.dart
rename to tests/language_2/async_nested/async_nested34_test.dart
diff --git a/tests/language_2/async_nested_35_test.dart b/tests/language_2/async_nested/async_nested35_test.dart
similarity index 100%
rename from tests/language_2/async_nested_35_test.dart
rename to tests/language_2/async_nested/async_nested35_test.dart
diff --git a/tests/language_2/async_nested_36_test.dart b/tests/language_2/async_nested/async_nested36_test.dart
similarity index 100%
rename from tests/language_2/async_nested_36_test.dart
rename to tests/language_2/async_nested/async_nested36_test.dart
diff --git a/tests/language_2/async_nested_37_test.dart b/tests/language_2/async_nested/async_nested37_test.dart
similarity index 100%
rename from tests/language_2/async_nested_37_test.dart
rename to tests/language_2/async_nested/async_nested37_test.dart
diff --git a/tests/language_2/async_nested_38_test.dart b/tests/language_2/async_nested/async_nested38_test.dart
similarity index 100%
rename from tests/language_2/async_nested_38_test.dart
rename to tests/language_2/async_nested/async_nested38_test.dart
diff --git a/tests/language_2/async_nested_39_test.dart b/tests/language_2/async_nested/async_nested39_test.dart
similarity index 100%
rename from tests/language_2/async_nested_39_test.dart
rename to tests/language_2/async_nested/async_nested39_test.dart
diff --git a/tests/language_2/async_nested_40_test.dart b/tests/language_2/async_nested/async_nested40_test.dart
similarity index 100%
rename from tests/language_2/async_nested_40_test.dart
rename to tests/language_2/async_nested/async_nested40_test.dart
diff --git a/tests/language_2/async_nested_41_test.dart b/tests/language_2/async_nested/async_nested41_test.dart
similarity index 100%
rename from tests/language_2/async_nested_41_test.dart
rename to tests/language_2/async_nested/async_nested41_test.dart
diff --git a/tests/language_2/async_star_test.dart b/tests/language_2/async_star/async_star2_test.dart
similarity index 100%
rename from tests/language_2/async_star_test.dart
rename to tests/language_2/async_star/async_star2_test.dart
diff --git a/tests/language_2/async_star_await_pauses_test.dart b/tests/language_2/async_star/await_pauses_test.dart
similarity index 100%
rename from tests/language_2/async_star_await_pauses_test.dart
rename to tests/language_2/async_star/await_pauses_test.dart
diff --git a/tests/language_2/async_star_cancel_and_throw_in_finally_test.dart b/tests/language_2/async_star/cancel_and_throw_in_finally_test.dart
similarity index 100%
rename from tests/language_2/async_star_cancel_and_throw_in_finally_test.dart
rename to tests/language_2/async_star/cancel_and_throw_in_finally_test.dart
diff --git a/tests/language_2/async_star_cancel_while_paused_test.dart b/tests/language_2/async_star/cancel_while_paused_test.dart
similarity index 100%
rename from tests/language_2/async_star_cancel_while_paused_test.dart
rename to tests/language_2/async_star/cancel_while_paused_test.dart
diff --git a/tests/language_2/asyncstar_concat_test.dart b/tests/language_2/async_star/concat_test.dart
similarity index 100%
rename from tests/language_2/asyncstar_concat_test.dart
rename to tests/language_2/async_star/concat_test.dart
diff --git a/tests/language_2/asyncstar_covariant_type_test.dart b/tests/language_2/async_star/covariant_type_test.dart
similarity index 100%
rename from tests/language_2/asyncstar_covariant_type_test.dart
rename to tests/language_2/async_star/covariant_type_test.dart
diff --git a/tests/language_2/asyncstar_dcall_type_test.dart b/tests/language_2/async_star/dcall_type_test.dart
similarity index 100%
rename from tests/language_2/asyncstar_dcall_type_test.dart
rename to tests/language_2/async_star/dcall_type_test.dart
diff --git a/tests/language_2/async_star_error_test.dart b/tests/language_2/async_star/error_test.dart
similarity index 100%
rename from tests/language_2/async_star_error_test.dart
rename to tests/language_2/async_star/error_test.dart
diff --git a/tests/language_2/async_star_no_cancel2_test.dart b/tests/language_2/async_star/no_cancel2_test.dart
similarity index 100%
rename from tests/language_2/async_star_no_cancel2_test.dart
rename to tests/language_2/async_star/no_cancel2_test.dart
diff --git a/tests/language_2/async_star_no_cancel_test.dart b/tests/language_2/async_star/no_cancel_test.dart
similarity index 100%
rename from tests/language_2/async_star_no_cancel_test.dart
rename to tests/language_2/async_star/no_cancel_test.dart
diff --git a/tests/language_2/async_star_pause_test.dart b/tests/language_2/async_star/pause_test.dart
similarity index 100%
rename from tests/language_2/async_star_pause_test.dart
rename to tests/language_2/async_star/pause_test.dart
diff --git a/tests/language_2/async_star_regression_2238_test.dart b/tests/language_2/async_star/regression_2238_test.dart
similarity index 100%
rename from tests/language_2/async_star_regression_2238_test.dart
rename to tests/language_2/async_star/regression_2238_test.dart
diff --git a/tests/language_2/async_star_regression_23116_test.dart b/tests/language_2/async_star/regression_23116_test.dart
similarity index 100%
rename from tests/language_2/async_star_regression_23116_test.dart
rename to tests/language_2/async_star/regression_23116_test.dart
diff --git a/tests/language_2/async_star_regression_fisk_test.dart b/tests/language_2/async_star/regression_fisk_test.dart
similarity index 100%
rename from tests/language_2/async_star_regression_fisk_test.dart
rename to tests/language_2/async_star/regression_fisk_test.dart
diff --git a/tests/language_2/async_star_stream_take_test.dart b/tests/language_2/async_star/stream_take_test.dart
similarity index 100%
rename from tests/language_2/async_star_stream_take_test.dart
rename to tests/language_2/async_star/stream_take_test.dart
diff --git a/tests/language_2/async_star_take_reyield_test.dart b/tests/language_2/async_star/take_reyield_test.dart
similarity index 100%
rename from tests/language_2/async_star_take_reyield_test.dart
rename to tests/language_2/async_star/take_reyield_test.dart
diff --git a/tests/language_2/asyncstar_throw_in_catch_test.dart b/tests/language_2/async_star/throw_in_catch_test.dart
similarity index 100%
rename from tests/language_2/asyncstar_throw_in_catch_test.dart
rename to tests/language_2/async_star/throw_in_catch_test.dart
diff --git a/tests/language_2/asyncstar_yield_test.dart b/tests/language_2/async_star/yield_test.dart
similarity index 100%
rename from tests/language_2/asyncstar_yield_test.dart
rename to tests/language_2/async_star/yield_test.dart
diff --git a/tests/language_2/asyncstar_yieldstar_test.dart b/tests/language_2/async_star/yieldstar_test.dart
similarity index 100%
rename from tests/language_2/asyncstar_yieldstar_test.dart
rename to tests/language_2/async_star/yieldstar_test.dart
diff --git a/tests/language_2/await_and_ifnull_test.dart b/tests/language_2/await/and_ifnull_test.dart
similarity index 100%
rename from tests/language_2/await_and_ifnull_test.dart
rename to tests/language_2/await/and_ifnull_test.dart
diff --git a/tests/language_2/await_test.dart b/tests/language_2/await/await_test.dart
similarity index 100%
rename from tests/language_2/await_test.dart
rename to tests/language_2/await/await_test.dart
diff --git a/tests/language_2/await_backwards_compatibility_runtime_test.dart b/tests/language_2/await/backwards_compatibility_runtime_test.dart
similarity index 100%
rename from tests/language_2/await_backwards_compatibility_runtime_test.dart
rename to tests/language_2/await/backwards_compatibility_runtime_test.dart
diff --git a/tests/language_2/await_backwards_compatibility_test.dart b/tests/language_2/await/backwards_compatibility_test.dart
similarity index 100%
rename from tests/language_2/await_backwards_compatibility_test.dart
rename to tests/language_2/await/backwards_compatibility_test.dart
diff --git a/tests/language_2/await_exceptions_test.dart b/tests/language_2/await/exceptions_test.dart
similarity index 100%
rename from tests/language_2/await_exceptions_test.dart
rename to tests/language_2/await/exceptions_test.dart
diff --git a/tests/language_2/await_for_cancel_test.dart b/tests/language_2/await/for_cancel_test.dart
similarity index 100%
rename from tests/language_2/await_for_cancel_test.dart
rename to tests/language_2/await/for_cancel_test.dart
diff --git a/tests/language_2/await_for_test.dart b/tests/language_2/await/for_test.dart
similarity index 100%
rename from tests/language_2/await_for_test.dart
rename to tests/language_2/await/for_test.dart
diff --git a/tests/language_2/await_for_use_local_test.dart b/tests/language_2/await/for_use_local_test.dart
similarity index 100%
rename from tests/language_2/await_for_use_local_test.dart
rename to tests/language_2/await/for_use_local_test.dart
diff --git a/tests/language_2/await_future_test.dart b/tests/language_2/await/future_test.dart
similarity index 100%
rename from tests/language_2/await_future_test.dart
rename to tests/language_2/await/future_test.dart
diff --git a/tests/language_2/await_in_cascade_test.dart b/tests/language_2/await/in_cascade_test.dart
similarity index 100%
rename from tests/language_2/await_in_cascade_test.dart
rename to tests/language_2/await/in_cascade_test.dart
diff --git a/tests/language_2/await_nonfuture_test.dart b/tests/language_2/await/nonfuture_test.dart
similarity index 100%
rename from tests/language_2/await_nonfuture_test.dart
rename to tests/language_2/await/nonfuture_test.dart
diff --git a/tests/language_2/await_null_aware_test.dart b/tests/language_2/await/null_aware_test.dart
similarity index 100%
rename from tests/language_2/await_null_aware_test.dart
rename to tests/language_2/await/null_aware_test.dart
diff --git a/tests/language_2/await_postfix_expr_test.dart b/tests/language_2/await/postfix_expr_test.dart
similarity index 100%
rename from tests/language_2/await_postfix_expr_test.dart
rename to tests/language_2/await/postfix_expr_test.dart
diff --git a/tests/language_2/await_regression_test.dart b/tests/language_2/await/regression_test.dart
similarity index 100%
rename from tests/language_2/await_regression_test.dart
rename to tests/language_2/await/regression_test.dart
diff --git a/tests/language_2/await_started_immediately_test.dart b/tests/language_2/await/started_immediately_test.dart
similarity index 100%
rename from tests/language_2/await_started_immediately_test.dart
rename to tests/language_2/await/started_immediately_test.dart
diff --git a/tests/language_2/bool_test.dart b/tests/language_2/bool/bool_test.dart
similarity index 100%
rename from tests/language_2/bool_test.dart
rename to tests/language_2/bool/bool_test.dart
diff --git a/tests/language_2/bool_check_test.dart b/tests/language_2/bool/check_test.dart
similarity index 100%
rename from tests/language_2/bool_check_test.dart
rename to tests/language_2/bool/check_test.dart
diff --git a/tests/language_2/bool_condition_check_test.dart b/tests/language_2/bool/condition_check_test.dart
similarity index 100%
rename from tests/language_2/bool_condition_check_test.dart
rename to tests/language_2/bool/condition_check_test.dart
diff --git a/tests/language_2/call_argument_inference_test.dart b/tests/language_2/call/argument_inference_test.dart
similarity index 100%
rename from tests/language_2/call_argument_inference_test.dart
rename to tests/language_2/call/argument_inference_test.dart
diff --git a/tests/language_2/call_test.dart b/tests/language_2/call/call_test.dart
similarity index 100%
rename from tests/language_2/call_test.dart
rename to tests/language_2/call/call_test.dart
diff --git a/tests/language_2/call_closurization_test.dart b/tests/language_2/call/closurization_test.dart
similarity index 100%
rename from tests/language_2/call_closurization_test.dart
rename to tests/language_2/call/closurization_test.dart
diff --git a/tests/language_2/call_constructor_on_unresolvable_class_runtime_test.dart b/tests/language_2/call/constructor_on_unresolvable_class_runtime_test.dart
similarity index 100%
rename from tests/language_2/call_constructor_on_unresolvable_class_runtime_test.dart
rename to tests/language_2/call/constructor_on_unresolvable_class_runtime_test.dart
diff --git a/tests/language_2/call_constructor_on_unresolvable_class_test.dart b/tests/language_2/call/constructor_on_unresolvable_class_test.dart
similarity index 100%
rename from tests/language_2/call_constructor_on_unresolvable_class_test.dart
rename to tests/language_2/call/constructor_on_unresolvable_class_test.dart
diff --git a/tests/language_2/call_function2_test.dart b/tests/language_2/call/function2_test.dart
similarity index 100%
rename from tests/language_2/call_function2_test.dart
rename to tests/language_2/call/function2_test.dart
diff --git a/tests/language_2/call_function_apply_test.dart b/tests/language_2/call/function_apply_test.dart
similarity index 100%
rename from tests/language_2/call_function_apply_test.dart
rename to tests/language_2/call/function_apply_test.dart
diff --git a/tests/language_2/call_function_test.dart b/tests/language_2/call/function_test.dart
similarity index 100%
rename from tests/language_2/call_function_test.dart
rename to tests/language_2/call/function_test.dart
diff --git a/tests/language_2/call_method_as_cast_test.dart b/tests/language_2/call/method_as_cast_test.dart
similarity index 100%
rename from tests/language_2/call_method_as_cast_test.dart
rename to tests/language_2/call/method_as_cast_test.dart
diff --git a/tests/language_2/call_method_function_typed_value_test.dart b/tests/language_2/call/method_function_typed_value_test.dart
similarity index 100%
rename from tests/language_2/call_method_function_typed_value_test.dart
rename to tests/language_2/call/method_function_typed_value_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_instance_test.dart b/tests/language_2/call/method_implicit_invoke_instance_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_instance_test.dart
rename to tests/language_2/call/method_implicit_invoke_instance_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_local_runtime_1_test.dart b/tests/language_2/call/method_implicit_invoke_local_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_local_runtime_1_test.dart
rename to tests/language_2/call/method_implicit_invoke_local_runtime_1_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_local_runtime_2_test.dart b/tests/language_2/call/method_implicit_invoke_local_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_local_runtime_2_test.dart
rename to tests/language_2/call/method_implicit_invoke_local_runtime_2_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_local_runtime_3_test.dart b/tests/language_2/call/method_implicit_invoke_local_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_local_runtime_3_test.dart
rename to tests/language_2/call/method_implicit_invoke_local_runtime_3_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_local_runtime_4_test.dart b/tests/language_2/call/method_implicit_invoke_local_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_local_runtime_4_test.dart
rename to tests/language_2/call/method_implicit_invoke_local_runtime_4_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_local_runtime_test.dart b/tests/language_2/call/method_implicit_invoke_local_runtime_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_local_runtime_test.dart
rename to tests/language_2/call/method_implicit_invoke_local_runtime_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_local_test.dart b/tests/language_2/call/method_implicit_invoke_local_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_local_test.dart
rename to tests/language_2/call/method_implicit_invoke_local_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_static_test.dart b/tests/language_2/call/method_implicit_invoke_static_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_static_test.dart
rename to tests/language_2/call/method_implicit_invoke_static_test.dart
diff --git a/tests/language_2/call_method_implicit_invoke_top_level_test.dart b/tests/language_2/call/method_implicit_invoke_top_level_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_invoke_top_level_test.dart
rename to tests/language_2/call/method_implicit_invoke_top_level_test.dart
diff --git a/tests/language_2/call_method_implicit_tear_off_assignable_test.dart b/tests/language_2/call/method_implicit_tear_off_assignable_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_tear_off_assignable_test.dart
rename to tests/language_2/call/method_implicit_tear_off_assignable_test.dart
diff --git a/tests/language_2/call_method_implicit_tear_off_nullable_test.dart b/tests/language_2/call/method_implicit_tear_off_nullable_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_tear_off_nullable_test.dart
rename to tests/language_2/call/method_implicit_tear_off_nullable_test.dart
diff --git a/tests/language_2/call_method_implicit_tear_off_test.dart b/tests/language_2/call/method_implicit_tear_off_test.dart
similarity index 100%
rename from tests/language_2/call_method_implicit_tear_off_test.dart
rename to tests/language_2/call/method_implicit_tear_off_test.dart
diff --git a/tests/language_2/call_method_is_check_test.dart b/tests/language_2/call/method_is_check_test.dart
similarity index 100%
rename from tests/language_2/call_method_is_check_test.dart
rename to tests/language_2/call/method_is_check_test.dart
diff --git a/tests/language_2/call_method_must_not_be_field_test.dart b/tests/language_2/call/method_must_not_be_field_test.dart
similarity index 100%
rename from tests/language_2/call_method_must_not_be_field_test.dart
rename to tests/language_2/call/method_must_not_be_field_test.dart
diff --git a/tests/language_2/call_method_must_not_be_getter_test.dart b/tests/language_2/call/method_must_not_be_getter_test.dart
similarity index 100%
rename from tests/language_2/call_method_must_not_be_getter_test.dart
rename to tests/language_2/call/method_must_not_be_getter_test.dart
diff --git a/tests/language_2/call_method_override_runtime_test.dart b/tests/language_2/call/method_override_runtime_test.dart
similarity index 100%
rename from tests/language_2/call_method_override_runtime_test.dart
rename to tests/language_2/call/method_override_runtime_test.dart
diff --git a/tests/language_2/call_method_override_test.dart b/tests/language_2/call/method_override_test.dart
similarity index 100%
rename from tests/language_2/call_method_override_test.dart
rename to tests/language_2/call/method_override_test.dart
diff --git a/tests/language_2/call_non_method_field_runtime_test.dart b/tests/language_2/call/non_method_field_runtime_test.dart
similarity index 100%
rename from tests/language_2/call_non_method_field_runtime_test.dart
rename to tests/language_2/call/non_method_field_runtime_test.dart
diff --git a/tests/language_2/call_non_method_field_test.dart b/tests/language_2/call/non_method_field_test.dart
similarity index 100%
rename from tests/language_2/call_non_method_field_test.dart
rename to tests/language_2/call/non_method_field_test.dart
diff --git a/tests/language_2/call_nonexistent_constructor_runtime_test.dart b/tests/language_2/call/nonexistent_constructor_runtime_test.dart
similarity index 100%
rename from tests/language_2/call_nonexistent_constructor_runtime_test.dart
rename to tests/language_2/call/nonexistent_constructor_runtime_test.dart
diff --git a/tests/language_2/call_nonexistent_constructor_test.dart b/tests/language_2/call/nonexistent_constructor_test.dart
similarity index 100%
rename from tests/language_2/call_nonexistent_constructor_test.dart
rename to tests/language_2/call/nonexistent_constructor_test.dart
diff --git a/tests/language_2/call_nonexistent_static_test.dart b/tests/language_2/call/nonexistent_static_test.dart
similarity index 100%
rename from tests/language_2/call_nonexistent_static_test.dart
rename to tests/language_2/call/nonexistent_static_test.dart
diff --git a/tests/language_2/object_has_no_call_method_test.dart b/tests/language_2/call/object_has_no_call_method_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_test.dart
rename to tests/language_2/call/object_has_no_call_method_test.dart
diff --git a/tests/language_2/object_has_no_call_method_runtime_1_test.dart b/tests/language_2/call/object_has_no_call_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_runtime_1_test.dart
rename to tests/language_2/call/object_has_no_call_runtime_1_test.dart
diff --git a/tests/language_2/object_has_no_call_method_runtime_2_test.dart b/tests/language_2/call/object_has_no_call_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_runtime_2_test.dart
rename to tests/language_2/call/object_has_no_call_runtime_2_test.dart
diff --git a/tests/language_2/object_has_no_call_method_runtime_3_test.dart b/tests/language_2/call/object_has_no_call_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_runtime_3_test.dart
rename to tests/language_2/call/object_has_no_call_runtime_3_test.dart
diff --git a/tests/language_2/object_has_no_call_method_runtime_4_test.dart b/tests/language_2/call/object_has_no_call_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_runtime_4_test.dart
rename to tests/language_2/call/object_has_no_call_runtime_4_test.dart
diff --git a/tests/language_2/object_has_no_call_method_runtime_5_test.dart b/tests/language_2/call/object_has_no_call_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_runtime_5_test.dart
rename to tests/language_2/call/object_has_no_call_runtime_5_test.dart
diff --git a/tests/language_2/object_has_no_call_method_runtime_6_test.dart b/tests/language_2/call/object_has_no_call_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_runtime_6_test.dart
rename to tests/language_2/call/object_has_no_call_runtime_6_test.dart
diff --git a/tests/language_2/object_has_no_call_method_runtime_test.dart b/tests/language_2/call/object_has_no_call_runtime_test.dart
similarity index 100%
rename from tests/language_2/object_has_no_call_method_runtime_test.dart
rename to tests/language_2/call/object_has_no_call_runtime_test.dart
diff --git a/tests/language_2/call_operator_test.dart b/tests/language_2/call/operator_test.dart
similarity index 100%
rename from tests/language_2/call_operator_test.dart
rename to tests/language_2/call/operator_test.dart
diff --git a/tests/language_2/call_property_test.dart b/tests/language_2/call/property_test.dart
similarity index 100%
rename from tests/language_2/call_property_test.dart
rename to tests/language_2/call/property_test.dart
diff --git a/tests/language_2/call_through_getter_runtime_test.dart b/tests/language_2/call/through_getter_runtime_test.dart
similarity index 100%
rename from tests/language_2/call_through_getter_runtime_test.dart
rename to tests/language_2/call/through_getter_runtime_test.dart
diff --git a/tests/language_2/call_through_getter_test.dart b/tests/language_2/call/through_getter_test.dart
similarity index 100%
rename from tests/language_2/call_through_getter_test.dart
rename to tests/language_2/call/through_getter_test.dart
diff --git a/tests/language_2/call_through_null_getter_test.dart b/tests/language_2/call/through_null_getter_test.dart
similarity index 100%
rename from tests/language_2/call_through_null_getter_test.dart
rename to tests/language_2/call/through_null_getter_test.dart
diff --git a/tests/language_2/call_type_literal_test.dart b/tests/language_2/call/type_literal_test.dart
similarity index 100%
rename from tests/language_2/call_type_literal_test.dart
rename to tests/language_2/call/type_literal_test.dart
diff --git a/tests/language_2/call_with_no_such_method_test.dart b/tests/language_2/call/with_no_such_method_test.dart
similarity index 100%
rename from tests/language_2/call_with_no_such_method_test.dart
rename to tests/language_2/call/with_no_such_method_test.dart
diff --git a/tests/language_2/canonical_const2_test.dart b/tests/language_2/canonicalize/const2_test.dart
similarity index 100%
rename from tests/language_2/canonical_const2_test.dart
rename to tests/language_2/canonicalize/const2_test.dart
diff --git a/tests/language_2/canonical_const3_test.dart b/tests/language_2/canonicalize/const3_test.dart
similarity index 100%
rename from tests/language_2/canonical_const3_test.dart
rename to tests/language_2/canonicalize/const3_test.dart
diff --git a/tests/language_2/canonical_const_test.dart b/tests/language_2/canonicalize/const_test.dart
similarity index 100%
rename from tests/language_2/canonical_const_test.dart
rename to tests/language_2/canonicalize/const_test.dart
diff --git a/tests/language_2/canonicalization_hashing_memoize_array_test.dart b/tests/language_2/canonicalize/hashing_memoize_array_test.dart
similarity index 100%
rename from tests/language_2/canonicalization_hashing_memoize_array_test.dart
rename to tests/language_2/canonicalize/hashing_memoize_array_test.dart
diff --git a/tests/language_2/canonicalization_hashing_memoize_instance_test.dart b/tests/language_2/canonicalize/hashing_memoize_instance_test.dart
similarity index 100%
rename from tests/language_2/canonicalization_hashing_memoize_instance_test.dart
rename to tests/language_2/canonicalize/hashing_memoize_instance_test.dart
diff --git a/tests/language_2/canonicalization_hashing_shallow_collision_array_test.dart b/tests/language_2/canonicalize/hashing_shallow_collision_array_test.dart
similarity index 100%
rename from tests/language_2/canonicalization_hashing_shallow_collision_array_test.dart
rename to tests/language_2/canonicalize/hashing_shallow_collision_array_test.dart
diff --git a/tests/language_2/canonicalization_hashing_shallow_collision_instance_2_test.dart b/tests/language_2/canonicalize/hashing_shallow_collision_instance_2_test.dart
similarity index 100%
rename from tests/language_2/canonicalization_hashing_shallow_collision_instance_2_test.dart
rename to tests/language_2/canonicalize/hashing_shallow_collision_instance_2_test.dart
diff --git a/tests/language_2/canonicalization_hashing_shallow_collision_instance_3_test.dart b/tests/language_2/canonicalize/hashing_shallow_collision_instance_3_test.dart
similarity index 100%
rename from tests/language_2/canonicalization_hashing_shallow_collision_instance_3_test.dart
rename to tests/language_2/canonicalize/hashing_shallow_collision_instance_3_test.dart
diff --git a/tests/language_2/canonicalization_hashing_shallow_collision_instance_test.dart b/tests/language_2/canonicalize/hashing_shallow_collision_instance_test.dart
similarity index 100%
rename from tests/language_2/canonicalization_hashing_shallow_collision_instance_test.dart
rename to tests/language_2/canonicalize/hashing_shallow_collision_instance_test.dart
diff --git a/tests/language_2/cascade2_test.dart b/tests/language_2/cascade/cascade2_test.dart
similarity index 100%
rename from tests/language_2/cascade2_test.dart
rename to tests/language_2/cascade/cascade2_test.dart
diff --git a/tests/language_2/cascade_2_test.dart b/tests/language_2/cascade/cascade3_test.dart
similarity index 100%
rename from tests/language_2/cascade_2_test.dart
rename to tests/language_2/cascade/cascade3_test.dart
diff --git a/tests/language_2/cascade_test.dart b/tests/language_2/cascade/cascade_test.dart
similarity index 100%
rename from tests/language_2/cascade_test.dart
rename to tests/language_2/cascade/cascade_test.dart
diff --git a/tests/language_2/cascade_in_expression_function_test.dart b/tests/language_2/cascade/in_expression_function_test.dart
similarity index 100%
rename from tests/language_2/cascade_in_expression_function_test.dart
rename to tests/language_2/cascade/in_expression_function_test.dart
diff --git a/tests/language_2/cascade_in_initializer_list_test.dart b/tests/language_2/cascade/in_initializer_list_test.dart
similarity index 100%
rename from tests/language_2/cascade_in_initializer_list_test.dart
rename to tests/language_2/cascade/in_initializer_list_test.dart
diff --git a/tests/language_2/cascade_nested_test.dart b/tests/language_2/cascade/nested_test.dart
similarity index 100%
rename from tests/language_2/cascade_nested_test.dart
rename to tests/language_2/cascade/nested_test.dart
diff --git a/tests/language_2/cascade_on_static_field_test.dart b/tests/language_2/cascade/on_static_field_test.dart
similarity index 100%
rename from tests/language_2/cascade_on_static_field_test.dart
rename to tests/language_2/cascade/on_static_field_test.dart
diff --git a/tests/language_2/cascade_precedence_test.dart b/tests/language_2/cascade/precedence_test.dart
similarity index 100%
rename from tests/language_2/cascade_precedence_test.dart
rename to tests/language_2/cascade/precedence_test.dart
diff --git a/tests/language_2/cascade_runtime_test.dart b/tests/language_2/cascade/runtime_test.dart
similarity index 100%
rename from tests/language_2/cascade_runtime_test.dart
rename to tests/language_2/cascade/runtime_test.dart
diff --git a/tests/language_2/additional_interface_adds_optional_args_concrete_subclass_test.dart b/tests/language_2/class/additional_interface_adds_optional_args_concrete_subclass_test.dart
similarity index 100%
rename from tests/language_2/additional_interface_adds_optional_args_concrete_subclass_test.dart
rename to tests/language_2/class/additional_interface_adds_optional_args_concrete_subclass_test.dart
diff --git a/tests/language_2/class_test.dart b/tests/language_2/class/class_test.dart
similarity index 100%
rename from tests/language_2/class_test.dart
rename to tests/language_2/class/class_test.dart
diff --git a/tests/language_2/classes_static_method_clash_test.dart b/tests/language_2/class/classes_static_method_clash_test.dart
similarity index 100%
rename from tests/language_2/classes_static_method_clash_test.dart
rename to tests/language_2/class/classes_static_method_clash_test.dart
diff --git a/tests/language_2/class_codegen_test.dart b/tests/language_2/class/codegen_test.dart
similarity index 100%
rename from tests/language_2/class_codegen_test.dart
rename to tests/language_2/class/codegen_test.dart
diff --git a/tests/language_2/class_cycle2_test.dart b/tests/language_2/class/cycle2_test.dart
similarity index 100%
rename from tests/language_2/class_cycle2_test.dart
rename to tests/language_2/class/cycle2_test.dart
diff --git a/tests/language_2/class_cycle_test.dart b/tests/language_2/class/cycle_test.dart
similarity index 100%
rename from tests/language_2/class_cycle_test.dart
rename to tests/language_2/class/cycle_test.dart
diff --git a/tests/language_2/cyclic_class_member_runtime_test.dart b/tests/language_2/class/cyclic_class_member_runtime_test.dart
similarity index 100%
rename from tests/language_2/cyclic_class_member_runtime_test.dart
rename to tests/language_2/class/cyclic_class_member_runtime_test.dart
diff --git a/tests/language_2/cyclic_class_member_test.dart b/tests/language_2/class/cyclic_class_member_test.dart
similarity index 100%
rename from tests/language_2/cyclic_class_member_test.dart
rename to tests/language_2/class/cyclic_class_member_test.dart
diff --git a/tests/language_2/inheritance_chain_lib.dart b/tests/language_2/class/inheritance_chain_lib.dart
similarity index 100%
rename from tests/language_2/inheritance_chain_lib.dart
rename to tests/language_2/class/inheritance_chain_lib.dart
diff --git a/tests/language_2/inheritance_chain_test.dart b/tests/language_2/class/inheritance_chain_test.dart
similarity index 100%
rename from tests/language_2/inheritance_chain_test.dart
rename to tests/language_2/class/inheritance_chain_test.dart
diff --git a/tests/language_2/class_keyword_runtime_test.dart b/tests/language_2/class/keyword_runtime_test.dart
similarity index 100%
rename from tests/language_2/class_keyword_runtime_test.dart
rename to tests/language_2/class/keyword_runtime_test.dart
diff --git a/tests/language_2/class_keyword_test.dart b/tests/language_2/class/keyword_test.dart
similarity index 100%
rename from tests/language_2/class_keyword_test.dart
rename to tests/language_2/class/keyword_test.dart
diff --git a/tests/language_2/large_class_declaration_test.dart b/tests/language_2/class/large_class_declaration_test.dart
similarity index 100%
rename from tests/language_2/large_class_declaration_test.dart
rename to tests/language_2/class/large_class_declaration_test.dart
diff --git a/tests/language_2/class_literal_static_test.dart b/tests/language_2/class/literal_static_test.dart
similarity index 100%
rename from tests/language_2/class_literal_static_test.dart
rename to tests/language_2/class/literal_static_test.dart
diff --git a/tests/language_2/class_literal_test.dart b/tests/language_2/class/literal_test.dart
similarity index 100%
rename from tests/language_2/class_literal_test.dart
rename to tests/language_2/class/literal_test.dart
diff --git a/tests/language_2/multiple_interface_inheritance_test.dart b/tests/language_2/class/multiple_interface_inheritance_test.dart
similarity index 100%
rename from tests/language_2/multiple_interface_inheritance_test.dart
rename to tests/language_2/class/multiple_interface_inheritance_test.dart
diff --git a/tests/language_2/class_override_test.dart b/tests/language_2/class/override_test.dart
similarity index 100%
rename from tests/language_2/class_override_test.dart
rename to tests/language_2/class/override_test.dart
diff --git a/tests/language_2/recursive_inheritance_test.dart b/tests/language_2/class/recursive_inheritance_test.dart
similarity index 100%
rename from tests/language_2/recursive_inheritance_test.dart
rename to tests/language_2/class/recursive_inheritance_test.dart
diff --git a/tests/language_2/class_syntax2_test.dart b/tests/language_2/class/syntax2_test.dart
similarity index 100%
rename from tests/language_2/class_syntax2_test.dart
rename to tests/language_2/class/syntax2_test.dart
diff --git a/tests/language_2/class_syntax_test.dart b/tests/language_2/class/syntax_test.dart
similarity index 100%
rename from tests/language_2/class_syntax_test.dart
rename to tests/language_2/class/syntax_test.dart
diff --git a/tests/language_2/variable_shadow_class_runtime_test.dart b/tests/language_2/class/variable_shadow_class_runtime_test.dart
similarity index 100%
rename from tests/language_2/variable_shadow_class_runtime_test.dart
rename to tests/language_2/class/variable_shadow_class_runtime_test.dart
diff --git a/tests/language_2/variable_shadow_class_test.dart b/tests/language_2/class/variable_shadow_class_test.dart
similarity index 100%
rename from tests/language_2/variable_shadow_class_test.dart
rename to tests/language_2/class/variable_shadow_class_test.dart
diff --git a/tests/language_2/bound_closure_equality_test.dart b/tests/language_2/closure/bound_closure_equality_test.dart
similarity index 100%
rename from tests/language_2/bound_closure_equality_test.dart
rename to tests/language_2/closure/bound_closure_equality_test.dart
diff --git a/tests/language_2/bound_closure_primitives_test.dart b/tests/language_2/closure/bound_closure_primitives_test.dart
similarity index 100%
rename from tests/language_2/bound_closure_primitives_test.dart
rename to tests/language_2/closure/bound_closure_primitives_test.dart
diff --git a/tests/language_2/closure_break1_test.dart b/tests/language_2/closure/break1_test.dart
similarity index 100%
rename from tests/language_2/closure_break1_test.dart
rename to tests/language_2/closure/break1_test.dart
diff --git a/tests/language_2/closure_break2_test.dart b/tests/language_2/closure/break2_test.dart
similarity index 100%
rename from tests/language_2/closure_break2_test.dart
rename to tests/language_2/closure/break2_test.dart
diff --git a/tests/language_2/closure_break_test.dart b/tests/language_2/closure/break_test.dart
similarity index 100%
rename from tests/language_2/closure_break_test.dart
rename to tests/language_2/closure/break_test.dart
diff --git a/tests/language_2/closure_call_wrong_argument_count_test.dart b/tests/language_2/closure/call_wrong_argument_count_test.dart
similarity index 100%
rename from tests/language_2/closure_call_wrong_argument_count_test.dart
rename to tests/language_2/closure/call_wrong_argument_count_test.dart
diff --git a/tests/language_2/closure2_test.dart b/tests/language_2/closure/closure2_test.dart
similarity index 100%
rename from tests/language_2/closure2_test.dart
rename to tests/language_2/closure/closure2_test.dart
diff --git a/tests/language_2/closure3_test.dart b/tests/language_2/closure/closure3_test.dart
similarity index 100%
rename from tests/language_2/closure3_test.dart
rename to tests/language_2/closure/closure3_test.dart
diff --git a/tests/language_2/closure4_test.dart b/tests/language_2/closure/closure4_test.dart
similarity index 100%
rename from tests/language_2/closure4_test.dart
rename to tests/language_2/closure/closure4_test.dart
diff --git a/tests/language_2/closure5_test.dart b/tests/language_2/closure/closure5_test.dart
similarity index 100%
rename from tests/language_2/closure5_test.dart
rename to tests/language_2/closure/closure5_test.dart
diff --git a/tests/language_2/closure6_test.dart b/tests/language_2/closure/closure6_test.dart
similarity index 100%
rename from tests/language_2/closure6_test.dart
rename to tests/language_2/closure/closure6_test.dart
diff --git a/tests/language_2/closure7_test.dart b/tests/language_2/closure/closure7_test.dart
similarity index 100%
rename from tests/language_2/closure7_test.dart
rename to tests/language_2/closure/closure7_test.dart
diff --git a/tests/language_2/closure8_test.dart b/tests/language_2/closure/closure8_test.dart
similarity index 100%
rename from tests/language_2/closure8_test.dart
rename to tests/language_2/closure/closure8_test.dart
diff --git a/tests/language_2/closure_test.dart b/tests/language_2/closure/closure_test.dart
similarity index 100%
rename from tests/language_2/closure_test.dart
rename to tests/language_2/closure/closure_test.dart
diff --git a/tests/language_2/closures_initializer2_test.dart b/tests/language_2/closure/closures_initializer2_test.dart
similarity index 100%
rename from tests/language_2/closures_initializer2_test.dart
rename to tests/language_2/closure/closures_initializer2_test.dart
diff --git a/tests/language_2/closures_initializer_test.dart b/tests/language_2/closure/closures_initializer_test.dart
similarity index 100%
rename from tests/language_2/closures_initializer_test.dart
rename to tests/language_2/closure/closures_initializer_test.dart
diff --git a/tests/language_2/closures_with_complex_params_test.dart b/tests/language_2/closure/closures_with_complex_params_test.dart
similarity index 100%
rename from tests/language_2/closures_with_complex_params_test.dart
rename to tests/language_2/closure/closures_with_complex_params_test.dart
diff --git a/tests/language_2/closure_cycles_test.dart b/tests/language_2/closure/cycles_test.dart
similarity index 100%
rename from tests/language_2/closure_cycles_test.dart
rename to tests/language_2/closure/cycles_test.dart
diff --git a/tests/language_2/forwarding_stub_tearoff_generic_test.dart b/tests/language_2/closure/forwarding_stub_tearoff_generic_test.dart
similarity index 100%
rename from tests/language_2/forwarding_stub_tearoff_generic_test.dart
rename to tests/language_2/closure/forwarding_stub_tearoff_generic_test.dart
diff --git a/tests/language_2/forwarding_stub_tearoff_test.dart b/tests/language_2/closure/forwarding_stub_tearoff_test.dart
similarity index 100%
rename from tests/language_2/forwarding_stub_tearoff_test.dart
rename to tests/language_2/closure/forwarding_stub_tearoff_test.dart
diff --git a/tests/language_2/implicit_closure1_test.dart b/tests/language_2/closure/implicit1_test.dart
similarity index 100%
rename from tests/language_2/implicit_closure1_test.dart
rename to tests/language_2/closure/implicit1_test.dart
diff --git a/tests/language_2/implicit_closure2_test.dart b/tests/language_2/closure/implicit2_test.dart
similarity index 100%
rename from tests/language_2/implicit_closure2_test.dart
rename to tests/language_2/closure/implicit2_test.dart
diff --git a/tests/language_2/implicit_closure_test.dart b/tests/language_2/closure/implicit_closure_test.dart
similarity index 100%
rename from tests/language_2/implicit_closure_test.dart
rename to tests/language_2/closure/implicit_closure_test.dart
diff --git a/tests/language_2/closure_in_constructor_test.dart b/tests/language_2/closure/in_constructor_test.dart
similarity index 100%
rename from tests/language_2/closure_in_constructor_test.dart
rename to tests/language_2/closure/in_constructor_test.dart
diff --git a/tests/language_2/closure_in_field_initializer_test.dart b/tests/language_2/closure/in_field_initializer_test.dart
similarity index 100%
rename from tests/language_2/closure_in_field_initializer_test.dart
rename to tests/language_2/closure/in_field_initializer_test.dart
diff --git a/tests/language_2/closure_in_initializer2_test.dart b/tests/language_2/closure/in_initializer2_test.dart
similarity index 100%
rename from tests/language_2/closure_in_initializer2_test.dart
rename to tests/language_2/closure/in_initializer2_test.dart
diff --git a/tests/language_2/closure_in_initializer_test.dart b/tests/language_2/closure/in_initializer_test.dart
similarity index 100%
rename from tests/language_2/closure_in_initializer_test.dart
rename to tests/language_2/closure/in_initializer_test.dart
diff --git a/tests/language_2/closure_internals_runtime_test.dart b/tests/language_2/closure/internals_runtime_test.dart
similarity index 100%
rename from tests/language_2/closure_internals_runtime_test.dart
rename to tests/language_2/closure/internals_runtime_test.dart
diff --git a/tests/language_2/closure_internals_test.dart b/tests/language_2/closure/internals_test.dart
similarity index 100%
rename from tests/language_2/closure_internals_test.dart
rename to tests/language_2/closure/internals_test.dart
diff --git a/tests/language_2/closure_invoked_through_interface_target_field_test.dart b/tests/language_2/closure/invoked_through_interface_target_field_test.dart
similarity index 100%
rename from tests/language_2/closure_invoked_through_interface_target_field_test.dart
rename to tests/language_2/closure/invoked_through_interface_target_field_test.dart
diff --git a/tests/language_2/closure_invoked_through_interface_target_getter_test.dart b/tests/language_2/closure/invoked_through_interface_target_getter_test.dart
similarity index 100%
rename from tests/language_2/closure_invoked_through_interface_target_getter_test.dart
rename to tests/language_2/closure/invoked_through_interface_target_getter_test.dart
diff --git a/tests/language_2/minify_closure_variable_collision_test.dart b/tests/language_2/closure/minify_closure_variable_collision_test.dart
similarity index 100%
rename from tests/language_2/minify_closure_variable_collision_test.dart
rename to tests/language_2/closure/minify_closure_variable_collision_test.dart
diff --git a/tests/language_2/nested_generic_closure_test.dart b/tests/language_2/closure/nested_generic_closure_test.dart
similarity index 100%
rename from tests/language_2/nested_generic_closure_test.dart
rename to tests/language_2/closure/nested_generic_closure_test.dart
diff --git a/tests/language_2/closure_param_null_to_object_test.dart b/tests/language_2/closure/param_null_to_object_test.dart
similarity index 100%
rename from tests/language_2/closure_param_null_to_object_test.dart
rename to tests/language_2/closure/param_null_to_object_test.dart
diff --git a/tests/language_2/closure_parameter_types_test.dart b/tests/language_2/closure/parameter_types_test.dart
similarity index 100%
rename from tests/language_2/closure_parameter_types_test.dart
rename to tests/language_2/closure/parameter_types_test.dart
diff --git a/tests/language_2/parse_closures_in_initializers_test.dart b/tests/language_2/closure/parse_closures_in_initializers_test.dart
similarity index 100%
rename from tests/language_2/parse_closures_in_initializers_test.dart
rename to tests/language_2/closure/parse_closures_in_initializers_test.dart
diff --git a/tests/language_2/partial_instantiation_eager_bounds_check_test.dart b/tests/language_2/closure/partial_instantiation_eager_bounds_check_test.dart
similarity index 100%
rename from tests/language_2/partial_instantiation_eager_bounds_check_test.dart
rename to tests/language_2/closure/partial_instantiation_eager_bounds_check_test.dart
diff --git a/tests/language_2/partial_instantiation_static_bounds_check_runtime_test.dart b/tests/language_2/closure/partial_instantiation_static_bounds_check_runtime_test.dart
similarity index 100%
rename from tests/language_2/partial_instantiation_static_bounds_check_runtime_test.dart
rename to tests/language_2/closure/partial_instantiation_static_bounds_check_runtime_test.dart
diff --git a/tests/language_2/partial_instantiation_static_bounds_check_test.dart b/tests/language_2/closure/partial_instantiation_static_bounds_check_test.dart
similarity index 100%
rename from tests/language_2/partial_instantiation_static_bounds_check_test.dart
rename to tests/language_2/closure/partial_instantiation_static_bounds_check_test.dart
diff --git a/tests/language_2/partial_tearoff_instantiation_test.dart b/tests/language_2/closure/partial_tearoff_instantiation_test.dart
similarity index 100%
rename from tests/language_2/partial_tearoff_instantiation_test.dart
rename to tests/language_2/closure/partial_tearoff_instantiation_test.dart
diff --git a/tests/language_2/closure_self_reference_test.dart b/tests/language_2/closure/self_reference_test.dart
similarity index 100%
rename from tests/language_2/closure_self_reference_test.dart
rename to tests/language_2/closure/self_reference_test.dart
diff --git a/tests/language_2/closure_shared_state_test.dart b/tests/language_2/closure/shared_state_test.dart
similarity index 100%
rename from tests/language_2/closure_shared_state_test.dart
rename to tests/language_2/closure/shared_state_test.dart
diff --git a/tests/language_2/closure_side_effect_test.dart b/tests/language_2/closure/side_effect_test.dart
similarity index 100%
rename from tests/language_2/closure_side_effect_test.dart
rename to tests/language_2/closure/side_effect_test.dart
diff --git a/tests/language_2/tearoff_bounds_instantiation_test.dart b/tests/language_2/closure/tearoff_bounds_instantiation_test.dart
similarity index 100%
rename from tests/language_2/tearoff_bounds_instantiation_test.dart
rename to tests/language_2/closure/tearoff_bounds_instantiation_test.dart
diff --git a/tests/language_2/tearoff_dynamic_test.dart b/tests/language_2/closure/tearoff_dynamic_test.dart
similarity index 100%
rename from tests/language_2/tearoff_dynamic_test.dart
rename to tests/language_2/closure/tearoff_dynamic_test.dart
diff --git a/tests/language_2/closure_type_arguments_test.dart b/tests/language_2/closure/type_arguments_test.dart
similarity index 100%
rename from tests/language_2/closure_type_arguments_test.dart
rename to tests/language_2/closure/type_arguments_test.dart
diff --git a/tests/language_2/closure_type_test.dart b/tests/language_2/closure/type_test.dart
similarity index 100%
rename from tests/language_2/closure_type_test.dart
rename to tests/language_2/closure/type_test.dart
diff --git a/tests/language_2/closure_type_variable_test.dart b/tests/language_2/closure/type_variable_test.dart
similarity index 100%
rename from tests/language_2/closure_type_variable_test.dart
rename to tests/language_2/closure/type_variable_test.dart
diff --git a/tests/language_2/closure_type_variables_test.dart b/tests/language_2/closure/type_variables_test.dart
similarity index 100%
rename from tests/language_2/closure_type_variables_test.dart
rename to tests/language_2/closure/type_variables_test.dart
diff --git a/tests/language_2/unnamed_closure_test.dart b/tests/language_2/closure/unnamed_closure_test.dart
similarity index 100%
rename from tests/language_2/unnamed_closure_test.dart
rename to tests/language_2/closure/unnamed_closure_test.dart
diff --git a/tests/language_2/closure_variable_shadow_test.dart b/tests/language_2/closure/variable_shadow_test.dart
similarity index 100%
rename from tests/language_2/closure_variable_shadow_test.dart
rename to tests/language_2/closure/variable_shadow_test.dart
diff --git a/tests/language_2/closure_with_super_field_test.dart b/tests/language_2/closure/with_super_field_test.dart
similarity index 100%
rename from tests/language_2/closure_with_super_field_test.dart
rename to tests/language_2/closure/with_super_field_test.dart
diff --git a/tests/language_2/closure_with_super_send_test.dart b/tests/language_2/closure/with_super_send_test.dart
similarity index 100%
rename from tests/language_2/closure_with_super_send_test.dart
rename to tests/language_2/closure/with_super_send_test.dart
diff --git a/tests/language_2/compile_time_constant_a_test.dart b/tests/language_2/compile_time_constant/a_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_a_test.dart
rename to tests/language_2/compile_time_constant/a_test.dart
diff --git a/tests/language_2/compile_time_constant_arguments_runtime_test.dart b/tests/language_2/compile_time_constant/arguments_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_arguments_runtime_test.dart
rename to tests/language_2/compile_time_constant/arguments_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_arguments_test.dart b/tests/language_2/compile_time_constant/arguments_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_arguments_test.dart
rename to tests/language_2/compile_time_constant/arguments_test.dart
diff --git a/tests/language_2/compile_time_constant_b_test.dart b/tests/language_2/compile_time_constant/b_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_b_test.dart
rename to tests/language_2/compile_time_constant/b_test.dart
diff --git a/tests/language_2/compile_time_constant_c_runtime_1_test.dart b/tests/language_2/compile_time_constant/c_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_c_runtime_1_test.dart
rename to tests/language_2/compile_time_constant/c_runtime_1_test.dart
diff --git a/tests/language_2/compile_time_constant_c_runtime_test.dart b/tests/language_2/compile_time_constant/c_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_c_runtime_test.dart
rename to tests/language_2/compile_time_constant/c_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_c_test.dart b/tests/language_2/compile_time_constant/c_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_c_test.dart
rename to tests/language_2/compile_time_constant/c_test.dart
diff --git a/tests/language_2/compile_time_constant10_test.dart b/tests/language_2/compile_time_constant/compile_time_constant10_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant10_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant10_test.dart
diff --git a/tests/language_2/compile_time_constant11_test.dart b/tests/language_2/compile_time_constant/compile_time_constant11_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant11_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant11_test.dart
diff --git a/tests/language_2/compile_time_constant12_test.dart b/tests/language_2/compile_time_constant/compile_time_constant12_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant12_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant12_test.dart
diff --git a/tests/language_2/compile_time_constant13_test.dart b/tests/language_2/compile_time_constant/compile_time_constant13_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant13_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant13_test.dart
diff --git a/tests/language_2/compile_time_constant2_test.dart b/tests/language_2/compile_time_constant/compile_time_constant2_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant2_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant2_test.dart
diff --git a/tests/language_2/compile_time_constant3_test.dart b/tests/language_2/compile_time_constant/compile_time_constant3_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant3_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant3_test.dart
diff --git a/tests/language_2/compile_time_constant5_test.dart b/tests/language_2/compile_time_constant/compile_time_constant5_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant5_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant5_test.dart
diff --git a/tests/language_2/compile_time_constant6_test.dart b/tests/language_2/compile_time_constant/compile_time_constant6_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant6_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant6_test.dart
diff --git a/tests/language_2/compile_time_constant7_test.dart b/tests/language_2/compile_time_constant/compile_time_constant7_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant7_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant7_test.dart
diff --git a/tests/language_2/compile_time_constant8_test.dart b/tests/language_2/compile_time_constant/compile_time_constant8_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant8_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant8_test.dart
diff --git a/tests/language_2/compile_time_constant9_test.dart b/tests/language_2/compile_time_constant/compile_time_constant9_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant9_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant9_test.dart
diff --git a/tests/language_2/compile_time_constant_test.dart b/tests/language_2/compile_time_constant/compile_time_constant_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_test.dart
rename to tests/language_2/compile_time_constant/compile_time_constant_test.dart
diff --git a/tests/language_2/compile_time_constant_d_test.dart b/tests/language_2/compile_time_constant/d_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_d_test.dart
rename to tests/language_2/compile_time_constant/d_test.dart
diff --git a/tests/language_2/compile_time_constant_e_test.dart b/tests/language_2/compile_time_constant/e_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_e_test.dart
rename to tests/language_2/compile_time_constant/e_test.dart
diff --git a/tests/language_2/compile_time_constant_f_test.dart b/tests/language_2/compile_time_constant/f_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_f_test.dart
rename to tests/language_2/compile_time_constant/f_test.dart
diff --git a/tests/language_2/compile_time_constant_g_test.dart b/tests/language_2/compile_time_constant/g_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_g_test.dart
rename to tests/language_2/compile_time_constant/g_test.dart
diff --git a/tests/language_2/compile_time_constant_h_test.dart b/tests/language_2/compile_time_constant/h_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_h_test.dart
rename to tests/language_2/compile_time_constant/h_test.dart
diff --git a/tests/language_2/compile_time_constant_i_test.dart b/tests/language_2/compile_time_constant/i_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_i_test.dart
rename to tests/language_2/compile_time_constant/i_test.dart
diff --git a/tests/language_2/compile_time_constant_j_test.dart b/tests/language_2/compile_time_constant/j_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_j_test.dart
rename to tests/language_2/compile_time_constant/j_test.dart
diff --git a/tests/language_2/compile_time_constant_k_runtime_test.dart b/tests/language_2/compile_time_constant/k_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_k_runtime_test.dart
rename to tests/language_2/compile_time_constant/k_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_k_test.dart b/tests/language_2/compile_time_constant/k_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_k_test.dart
rename to tests/language_2/compile_time_constant/k_test.dart
diff --git a/tests/language_2/compile_time_constant_l_test.dart b/tests/language_2/compile_time_constant/l_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_l_test.dart
rename to tests/language_2/compile_time_constant/l_test.dart
diff --git a/tests/language_2/compile_time_constant_m_test.dart b/tests/language_2/compile_time_constant/m_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_m_test.dart
rename to tests/language_2/compile_time_constant/m_test.dart
diff --git a/tests/language_2/compile_time_constant_n_test.dart b/tests/language_2/compile_time_constant/n_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_n_test.dart
rename to tests/language_2/compile_time_constant/n_test.dart
diff --git a/tests/language_2/compile_time_constant_o_runtime_test.dart b/tests/language_2/compile_time_constant/o_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_o_runtime_test.dart
rename to tests/language_2/compile_time_constant/o_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_o_test.dart b/tests/language_2/compile_time_constant/o_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_o_test.dart
rename to tests/language_2/compile_time_constant/o_test.dart
diff --git a/tests/language_2/compile_time_constant_p_runtime_test.dart b/tests/language_2/compile_time_constant/p_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_p_runtime_test.dart
rename to tests/language_2/compile_time_constant/p_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_p_test.dart b/tests/language_2/compile_time_constant/p_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_p_test.dart
rename to tests/language_2/compile_time_constant/p_test.dart
diff --git a/tests/language_2/compile_time_constant_q_test.dart b/tests/language_2/compile_time_constant/q_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_q_test.dart
rename to tests/language_2/compile_time_constant/q_test.dart
diff --git a/tests/language_2/compile_time_constant_r_runtime_test.dart b/tests/language_2/compile_time_constant/r_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_r_runtime_test.dart
rename to tests/language_2/compile_time_constant/r_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_r_test.dart b/tests/language_2/compile_time_constant/r_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_r_test.dart
rename to tests/language_2/compile_time_constant/r_test.dart
diff --git a/tests/language_2/compile_time_constant_runtime_test.dart b/tests/language_2/compile_time_constant/runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_runtime_test.dart
rename to tests/language_2/compile_time_constant/runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_static2_runtime_test.dart b/tests/language_2/compile_time_constant/static2_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static2_runtime_test.dart
rename to tests/language_2/compile_time_constant/static2_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_static2_test.dart b/tests/language_2/compile_time_constant/static2_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static2_test.dart
rename to tests/language_2/compile_time_constant/static2_test.dart
diff --git a/tests/language_2/compile_time_constant_static3_runtime_test.dart b/tests/language_2/compile_time_constant/static3_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static3_runtime_test.dart
rename to tests/language_2/compile_time_constant/static3_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_static3_test.dart b/tests/language_2/compile_time_constant/static3_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static3_test.dart
rename to tests/language_2/compile_time_constant/static3_test.dart
diff --git a/tests/language_2/compile_time_constant_static4_test.dart b/tests/language_2/compile_time_constant/static4_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static4_test.dart
rename to tests/language_2/compile_time_constant/static4_test.dart
diff --git a/tests/language_2/compile_time_constant_static5_test.dart b/tests/language_2/compile_time_constant/static5_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static5_test.dart
rename to tests/language_2/compile_time_constant/static5_test.dart
diff --git a/tests/language_2/compile_time_constant_static_runtime_test.dart b/tests/language_2/compile_time_constant/static_runtime_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static_runtime_test.dart
rename to tests/language_2/compile_time_constant/static_runtime_test.dart
diff --git a/tests/language_2/compile_time_constant_static_test.dart b/tests/language_2/compile_time_constant/static_test.dart
similarity index 100%
rename from tests/language_2/compile_time_constant_static_test.dart
rename to tests/language_2/compile_time_constant/static_test.dart
diff --git a/tests/language_2/const_cast1_test.dart b/tests/language_2/const/cast1_test.dart
similarity index 100%
rename from tests/language_2/const_cast1_test.dart
rename to tests/language_2/const/cast1_test.dart
diff --git a/tests/language_2/const_cast2_test.dart b/tests/language_2/const/cast2_test.dart
similarity index 100%
rename from tests/language_2/const_cast2_test.dart
rename to tests/language_2/const/cast2_test.dart
diff --git a/tests/language_2/const_cast3_test.dart b/tests/language_2/const/cast3_test.dart
similarity index 100%
rename from tests/language_2/const_cast3_test.dart
rename to tests/language_2/const/cast3_test.dart
diff --git a/tests/language_2/const_cast4_test.dart b/tests/language_2/const/cast4_test.dart
similarity index 100%
rename from tests/language_2/const_cast4_test.dart
rename to tests/language_2/const/cast4_test.dart
diff --git a/tests/language_2/const_conditional_runtime_test.dart b/tests/language_2/const/conditional_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_conditional_runtime_test.dart
rename to tests/language_2/const/conditional_runtime_test.dart
diff --git a/tests/language_2/const_conditional_test.dart b/tests/language_2/const/conditional_test.dart
similarity index 100%
rename from tests/language_2/const_conditional_test.dart
rename to tests/language_2/const/conditional_test.dart
diff --git a/tests/language_2/ct_const2_test.dart b/tests/language_2/const/const2_test.dart
similarity index 100%
rename from tests/language_2/ct_const2_test.dart
rename to tests/language_2/const/const2_test.dart
diff --git a/tests/language_2/ct_const3_test.dart b/tests/language_2/const/const3_test.dart
similarity index 100%
rename from tests/language_2/ct_const3_test.dart
rename to tests/language_2/const/const3_test.dart
diff --git a/tests/language_2/ct_const4_lib.dart b/tests/language_2/const/const4_lib.dart
similarity index 100%
rename from tests/language_2/ct_const4_lib.dart
rename to tests/language_2/const/const4_lib.dart
diff --git a/tests/language_2/ct_const4_test.dart b/tests/language_2/const/const4_test.dart
similarity index 91%
rename from tests/language_2/ct_const4_test.dart
rename to tests/language_2/const/const4_test.dart
index bdfeddbfecd..c47f33c84a8 100644
--- a/tests/language_2/ct_const4_test.dart
+++ b/tests/language_2/const/const4_test.dart
@@ -6,7 +6,7 @@
 library CTConst4Test;
 
 import "package:expect/expect.dart";
-import "ct_const4_lib.dart" as mylib;
+import "const4_lib.dart" as mylib;
 
 const A = mylib.B;
 
diff --git a/tests/language_2/constant_locals_test.dart b/tests/language_2/const/const_locals_constant_locals_test.dart
similarity index 100%
rename from tests/language_2/constant_locals_test.dart
rename to tests/language_2/const/const_locals_constant_locals_test.dart
diff --git a/tests/language_2/constant_locals_runtime_test.dart b/tests/language_2/const/const_locals_runtime_test.dart
similarity index 100%
rename from tests/language_2/constant_locals_runtime_test.dart
rename to tests/language_2/const/const_locals_runtime_test.dart
diff --git a/tests/language_2/const_test.dart b/tests/language_2/const/const_test.dart
similarity index 100%
rename from tests/language_2/const_test.dart
rename to tests/language_2/const/const_test.dart
diff --git a/tests/language_2/constants_test.dart b/tests/language_2/const/constants_test.dart
similarity index 100%
rename from tests/language_2/constants_test.dart
rename to tests/language_2/const/constants_test.dart
diff --git a/tests/language_2/const_constructor2_test.dart b/tests/language_2/const/constructor2_test.dart
similarity index 100%
rename from tests/language_2/const_constructor2_test.dart
rename to tests/language_2/const/constructor2_test.dart
diff --git a/tests/language_2/const_constructor3_runtime_1_test.dart b/tests/language_2/const/constructor3_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/const_constructor3_runtime_1_test.dart
rename to tests/language_2/const/constructor3_runtime_1_test.dart
diff --git a/tests/language_2/const_constructor3_runtime_2_test.dart b/tests/language_2/const/constructor3_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/const_constructor3_runtime_2_test.dart
rename to tests/language_2/const/constructor3_runtime_2_test.dart
diff --git a/tests/language_2/const_constructor3_runtime_test.dart b/tests/language_2/const/constructor3_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_constructor3_runtime_test.dart
rename to tests/language_2/const/constructor3_runtime_test.dart
diff --git a/tests/language_2/const_constructor3_test.dart b/tests/language_2/const/constructor3_test.dart
similarity index 100%
rename from tests/language_2/const_constructor3_test.dart
rename to tests/language_2/const/constructor3_test.dart
diff --git a/tests/language_2/const_constructor_mixin2_runtime_test.dart b/tests/language_2/const/constructor_mixin2_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_mixin2_runtime_test.dart
rename to tests/language_2/const/constructor_mixin2_runtime_test.dart
diff --git a/tests/language_2/const_constructor_mixin2_test.dart b/tests/language_2/const/constructor_mixin2_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_mixin2_test.dart
rename to tests/language_2/const/constructor_mixin2_test.dart
diff --git a/tests/language_2/const_constructor_mixin3_test.dart b/tests/language_2/const/constructor_mixin3_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_mixin3_test.dart
rename to tests/language_2/const/constructor_mixin3_test.dart
diff --git a/tests/language_2/const_constructor_mixin_test.dart b/tests/language_2/const/constructor_mixin_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_mixin_test.dart
rename to tests/language_2/const/constructor_mixin_test.dart
diff --git a/tests/language_2/const_constructor_nonconst_field_runtime_test.dart b/tests/language_2/const/constructor_nonconst_field_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_nonconst_field_runtime_test.dart
rename to tests/language_2/const/constructor_nonconst_field_runtime_test.dart
diff --git a/tests/language_2/const_constructor_nonconst_field_test.dart b/tests/language_2/const/constructor_nonconst_field_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_nonconst_field_test.dart
rename to tests/language_2/const/constructor_nonconst_field_test.dart
diff --git a/tests/language_2/const_constructor_nonconst_param_runtime_test.dart b/tests/language_2/const/constructor_nonconst_param_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_nonconst_param_runtime_test.dart
rename to tests/language_2/const/constructor_nonconst_param_runtime_test.dart
diff --git a/tests/language_2/const_constructor_nonconst_param_test.dart b/tests/language_2/const/constructor_nonconst_param_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_nonconst_param_test.dart
rename to tests/language_2/const/constructor_nonconst_param_test.dart
diff --git a/tests/language_2/const_constructor_runtime_test.dart b/tests/language_2/const/constructor_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_runtime_test.dart
rename to tests/language_2/const/constructor_runtime_test.dart
diff --git a/tests/language_2/const_constructor_super2_test.dart b/tests/language_2/const/constructor_super2_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_super2_test.dart
rename to tests/language_2/const/constructor_super2_test.dart
diff --git a/tests/language_2/const_constructor_super_runtime_test.dart b/tests/language_2/const/constructor_super_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_super_runtime_test.dart
rename to tests/language_2/const/constructor_super_runtime_test.dart
diff --git a/tests/language_2/const_constructor_super_test.dart b/tests/language_2/const/constructor_super_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_super_test.dart
rename to tests/language_2/const/constructor_super_test.dart
diff --git a/tests/language_2/const_constructor_syntax_runtime_test.dart b/tests/language_2/const/constructor_syntax_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_syntax_runtime_test.dart
rename to tests/language_2/const/constructor_syntax_runtime_test.dart
diff --git a/tests/language_2/const_constructor_syntax_test.dart b/tests/language_2/const/constructor_syntax_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_syntax_test.dart
rename to tests/language_2/const/constructor_syntax_test.dart
diff --git a/tests/language_2/const_constructor_test.dart b/tests/language_2/const/constructor_test.dart
similarity index 100%
rename from tests/language_2/const_constructor_test.dart
rename to tests/language_2/const/constructor_test.dart
diff --git a/tests/language_2/const_counter_runtime_test.dart b/tests/language_2/const/counter_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_counter_runtime_test.dart
rename to tests/language_2/const/counter_runtime_test.dart
diff --git a/tests/language_2/const_counter_test.dart b/tests/language_2/const/counter_test.dart
similarity index 100%
rename from tests/language_2/const_counter_test.dart
rename to tests/language_2/const/counter_test.dart
diff --git a/tests/language_2/ct_const_test.dart b/tests/language_2/const/ct_const_test.dart
similarity index 100%
rename from tests/language_2/ct_const_test.dart
rename to tests/language_2/const/ct_const_test.dart
diff --git a/tests/language_2/const_double_in_int_op_test.dart b/tests/language_2/const/double_in_int_op_test.dart
similarity index 100%
rename from tests/language_2/const_double_in_int_op_test.dart
rename to tests/language_2/const/double_in_int_op_test.dart
diff --git a/tests/language_2/const_dynamic_type_literal_runtime_1_test.dart b/tests/language_2/const/dynamic_type_literal_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/const_dynamic_type_literal_runtime_1_test.dart
rename to tests/language_2/const/dynamic_type_literal_runtime_1_test.dart
diff --git a/tests/language_2/const_dynamic_type_literal_runtime_2_test.dart b/tests/language_2/const/dynamic_type_literal_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/const_dynamic_type_literal_runtime_2_test.dart
rename to tests/language_2/const/dynamic_type_literal_runtime_2_test.dart
diff --git a/tests/language_2/const_dynamic_type_literal_runtime_test.dart b/tests/language_2/const/dynamic_type_literal_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_dynamic_type_literal_runtime_test.dart
rename to tests/language_2/const/dynamic_type_literal_runtime_test.dart
diff --git a/tests/language_2/const_dynamic_type_literal_test.dart b/tests/language_2/const/dynamic_type_literal_test.dart
similarity index 100%
rename from tests/language_2/const_dynamic_type_literal_test.dart
rename to tests/language_2/const/dynamic_type_literal_test.dart
diff --git a/tests/language_2/const_error_multiply_initialized_test.dart b/tests/language_2/const/error_multiply_initialized_test.dart
similarity index 100%
rename from tests/language_2/const_error_multiply_initialized_test.dart
rename to tests/language_2/const/error_multiply_initialized_test.dart
diff --git a/tests/language_2/const_escape_frog_test.dart b/tests/language_2/const/escape_frog_test.dart
similarity index 100%
rename from tests/language_2/const_escape_frog_test.dart
rename to tests/language_2/const/escape_frog_test.dart
diff --git a/tests/language_2/const_evaluation_test.dart b/tests/language_2/const/evaluation_test.dart
similarity index 100%
rename from tests/language_2/const_evaluation_test.dart
rename to tests/language_2/const/evaluation_test.dart
diff --git a/tests/language_2/const_factory_redirection_test.dart b/tests/language_2/const/factory_redirection_test.dart
similarity index 100%
rename from tests/language_2/const_factory_redirection_test.dart
rename to tests/language_2/const/factory_redirection_test.dart
diff --git a/tests/language_2/const_factory_with_body_runtime_test.dart b/tests/language_2/const/factory_with_body_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_factory_with_body_runtime_test.dart
rename to tests/language_2/const/factory_with_body_runtime_test.dart
diff --git a/tests/language_2/const_factory_with_body_test.dart b/tests/language_2/const/factory_with_body_test.dart
similarity index 100%
rename from tests/language_2/const_factory_with_body_test.dart
rename to tests/language_2/const/factory_with_body_test.dart
diff --git a/tests/language_2/const_for_in_variable_test.dart b/tests/language_2/const/for_in_variable_test.dart
similarity index 100%
rename from tests/language_2/const_for_in_variable_test.dart
rename to tests/language_2/const/for_in_variable_test.dart
diff --git a/tests/language_2/const_getter_runtime_test.dart b/tests/language_2/const/getter_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_getter_runtime_test.dart
rename to tests/language_2/const/getter_runtime_test.dart
diff --git a/tests/language_2/const_getter_test.dart b/tests/language_2/const/getter_test.dart
similarity index 100%
rename from tests/language_2/const_getter_test.dart
rename to tests/language_2/const/getter_test.dart
diff --git a/tests/language_2/const_global_test.dart b/tests/language_2/const/global_test.dart
similarity index 100%
rename from tests/language_2/const_global_test.dart
rename to tests/language_2/const/global_test.dart
diff --git a/tests/language_2/const_inference_test.dart b/tests/language_2/const/inference_test.dart
similarity index 100%
rename from tests/language_2/const_inference_test.dart
rename to tests/language_2/const/inference_test.dart
diff --git a/tests/language_2/const_init2_runtime_1_test.dart b/tests/language_2/const/init2_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/const_init2_runtime_1_test.dart
rename to tests/language_2/const/init2_runtime_1_test.dart
diff --git a/tests/language_2/const_init2_runtime_test.dart b/tests/language_2/const/init2_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_init2_runtime_test.dart
rename to tests/language_2/const/init2_runtime_test.dart
diff --git a/tests/language_2/const_init2_test.dart b/tests/language_2/const/init2_test.dart
similarity index 100%
rename from tests/language_2/const_init2_test.dart
rename to tests/language_2/const/init2_test.dart
diff --git a/tests/language_2/const_init_test.dart b/tests/language_2/const/init_test.dart
similarity index 100%
rename from tests/language_2/const_init_test.dart
rename to tests/language_2/const/init_test.dart
diff --git a/tests/language_2/const_instance_field_runtime_test.dart b/tests/language_2/const/instance_field_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_instance_field_runtime_test.dart
rename to tests/language_2/const/instance_field_runtime_test.dart
diff --git a/tests/language_2/const_instance_field_test.dart b/tests/language_2/const/instance_field_test.dart
similarity index 100%
rename from tests/language_2/const_instance_field_test.dart
rename to tests/language_2/const/instance_field_test.dart
diff --git a/tests/language_2/const_list_test.dart b/tests/language_2/const/list_test.dart
similarity index 100%
rename from tests/language_2/const_list_test.dart
rename to tests/language_2/const/list_test.dart
diff --git a/tests/language_2/const_local_test.dart b/tests/language_2/const/local_test.dart
similarity index 100%
rename from tests/language_2/const_local_test.dart
rename to tests/language_2/const/local_test.dart
diff --git a/tests/language_2/const_locals_test.dart b/tests/language_2/const/locals_test.dart
similarity index 100%
rename from tests/language_2/const_locals_test.dart
rename to tests/language_2/const/locals_test.dart
diff --git a/tests/language_2/const_map2_runtime_test.dart b/tests/language_2/const/map2_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_map2_runtime_test.dart
rename to tests/language_2/const/map2_runtime_test.dart
diff --git a/tests/language_2/const_map2_test.dart b/tests/language_2/const/map2_test.dart
similarity index 100%
rename from tests/language_2/const_map2_test.dart
rename to tests/language_2/const/map2_test.dart
diff --git a/tests/language_2/const_map3_runtime_test.dart b/tests/language_2/const/map3_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_map3_runtime_test.dart
rename to tests/language_2/const/map3_runtime_test.dart
diff --git a/tests/language_2/const_map3_test.dart b/tests/language_2/const/map3_test.dart
similarity index 100%
rename from tests/language_2/const_map3_test.dart
rename to tests/language_2/const/map3_test.dart
diff --git a/tests/language_2/const_map4_test.dart b/tests/language_2/const/map4_test.dart
similarity index 100%
rename from tests/language_2/const_map4_test.dart
rename to tests/language_2/const/map4_test.dart
diff --git a/tests/language_2/const_map_test.dart b/tests/language_2/const/map_test.dart
similarity index 100%
rename from tests/language_2/const_map_test.dart
rename to tests/language_2/const/map_test.dart
diff --git a/tests/language_2/const_named_test.dart b/tests/language_2/const/named_test.dart
similarity index 100%
rename from tests/language_2/const_named_test.dart
rename to tests/language_2/const/named_test.dart
diff --git a/tests/language_2/const_native_factory_test.dart b/tests/language_2/const/native_factory_test.dart
similarity index 100%
rename from tests/language_2/const_native_factory_test.dart
rename to tests/language_2/const/native_factory_test.dart
diff --git a/tests/language_2/const_nested_test.dart b/tests/language_2/const/nested_test.dart
similarity index 100%
rename from tests/language_2/const_nested_test.dart
rename to tests/language_2/const/nested_test.dart
diff --git a/tests/language_2/const_objects_are_immutable_test.dart b/tests/language_2/const/objects_are_immutable_test.dart
similarity index 100%
rename from tests/language_2/const_objects_are_immutable_test.dart
rename to tests/language_2/const/objects_are_immutable_test.dart
diff --git a/tests/language_2/const_optional_args_runtime_test.dart b/tests/language_2/const/optional_args_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_optional_args_runtime_test.dart
rename to tests/language_2/const/optional_args_runtime_test.dart
diff --git a/tests/language_2/const_optional_args_test.dart b/tests/language_2/const/optional_args_test.dart
similarity index 100%
rename from tests/language_2/const_optional_args_test.dart
rename to tests/language_2/const/optional_args_test.dart
diff --git a/tests/language_2/const_qq_test.dart b/tests/language_2/const/qq_test.dart
similarity index 100%
rename from tests/language_2/const_qq_test.dart
rename to tests/language_2/const/qq_test.dart
diff --git a/tests/language_2/const_redirect_skips_supertype_test.dart b/tests/language_2/const/redirect_skips_supertype_test.dart
similarity index 100%
rename from tests/language_2/const_redirect_skips_supertype_test.dart
rename to tests/language_2/const/redirect_skips_supertype_test.dart
diff --git a/tests/language_2/const_redirecting_factory_test.dart b/tests/language_2/const/redirecting_factory_test.dart
similarity index 100%
rename from tests/language_2/const_redirecting_factory_test.dart
rename to tests/language_2/const/redirecting_factory_test.dart
diff --git a/tests/language_2/constants_runtime_test.dart b/tests/language_2/const/runtime_test.dart
similarity index 100%
rename from tests/language_2/constants_runtime_test.dart
rename to tests/language_2/const/runtime_test.dart
diff --git a/tests/language_2/const_string_test.dart b/tests/language_2/const/string_test.dart
similarity index 100%
rename from tests/language_2/const_string_test.dart
rename to tests/language_2/const/string_test.dart
diff --git a/tests/language_2/const_switch2_runtime_test.dart b/tests/language_2/const/switch2_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_switch2_runtime_test.dart
rename to tests/language_2/const/switch2_runtime_test.dart
diff --git a/tests/language_2/const_switch2_test.dart b/tests/language_2/const/switch2_test.dart
similarity index 100%
rename from tests/language_2/const_switch2_test.dart
rename to tests/language_2/const/switch2_test.dart
diff --git a/tests/language_2/const_switch_test.dart b/tests/language_2/const/switch_test.dart
similarity index 100%
rename from tests/language_2/const_switch_test.dart
rename to tests/language_2/const/switch_test.dart
diff --git a/tests/language_2/const_syntax_runtime_test.dart b/tests/language_2/const/syntax_runtime_test.dart
similarity index 100%
rename from tests/language_2/const_syntax_runtime_test.dart
rename to tests/language_2/const/syntax_runtime_test.dart
diff --git a/tests/language_2/const_syntax_test.dart b/tests/language_2/const/syntax_test.dart
similarity index 100%
rename from tests/language_2/const_syntax_test.dart
rename to tests/language_2/const/syntax_test.dart
diff --git a/tests/language_2/const_tree_test.dart b/tests/language_2/const/tree_test.dart
similarity index 100%
rename from tests/language_2/const_tree_test.dart
rename to tests/language_2/const/tree_test.dart
diff --git a/tests/language_2/const_types_test.dart b/tests/language_2/const/types_test.dart
similarity index 100%
rename from tests/language_2/const_types_test.dart
rename to tests/language_2/const/types_test.dart
diff --git a/tests/language_2/const_var_helper.dart b/tests/language_2/const/var_helper.dart
similarity index 86%
rename from tests/language_2/const_var_helper.dart
rename to tests/language_2/const/var_helper.dart
index 5fb3dca3a1f..ad3806c2d92 100644
--- a/tests/language_2/const_var_helper.dart
+++ b/tests/language_2/const/var_helper.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 // All things regarding constant variables.
 
-/** Helper library for 'const_var_test.dart' */
+/** Helper library for 'var_test.dart' */
 library const_var_helper;
 
 class Foo<E> {
diff --git a/tests/language_2/const_var_test.dart b/tests/language_2/const/var_test.dart
similarity index 94%
rename from tests/language_2/const_var_test.dart
rename to tests/language_2/const/var_test.dart
index 21c808d3f3e..60557f65b9a 100644
--- a/tests/language_2/const_var_test.dart
+++ b/tests/language_2/const/var_test.dart
@@ -5,7 +5,7 @@
 
 library const_var;
 
-import 'const_var_helper.dart' as foo;
+import 'var_helper.dart' as foo;
 
 const untypedTopLevel = 1;
 const int typedTopLevel = 2;
diff --git a/tests/language_2/bad_constructor_runtime_1_test.dart b/tests/language_2/constructor/bad_constructor_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/bad_constructor_runtime_1_test.dart
rename to tests/language_2/constructor/bad_constructor_runtime_1_test.dart
diff --git a/tests/language_2/bad_constructor_runtime_test.dart b/tests/language_2/constructor/bad_constructor_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_constructor_runtime_test.dart
rename to tests/language_2/constructor/bad_constructor_runtime_test.dart
diff --git a/tests/language_2/bad_constructor_test.dart b/tests/language_2/constructor/bad_constructor_test.dart
similarity index 100%
rename from tests/language_2/bad_constructor_test.dart
rename to tests/language_2/constructor/bad_constructor_test.dart
diff --git a/tests/language_2/bad_named_constructor_runtime_test.dart b/tests/language_2/constructor/bad_named_constructor_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_named_constructor_runtime_test.dart
rename to tests/language_2/constructor/bad_named_constructor_runtime_test.dart
diff --git a/tests/language_2/bad_named_constructor_test.dart b/tests/language_2/constructor/bad_named_constructor_test.dart
similarity index 100%
rename from tests/language_2/bad_named_constructor_test.dart
rename to tests/language_2/constructor/bad_named_constructor_test.dart
diff --git a/tests/language_2/constructor_body_test.dart b/tests/language_2/constructor/body_test.dart
similarity index 100%
rename from tests/language_2/constructor_body_test.dart
rename to tests/language_2/constructor/body_test.dart
diff --git a/tests/language_2/bodyless_constructor_wrong_arg_runtime_test.dart b/tests/language_2/constructor/bodyless_wrong_arg_runtime_test.dart
similarity index 100%
rename from tests/language_2/bodyless_constructor_wrong_arg_runtime_test.dart
rename to tests/language_2/constructor/bodyless_wrong_arg_runtime_test.dart
diff --git a/tests/language_2/bodyless_constructor_wrong_arg_test.dart b/tests/language_2/constructor/bodyless_wrong_arg_test.dart
similarity index 100%
rename from tests/language_2/bodyless_constructor_wrong_arg_test.dart
rename to tests/language_2/constructor/bodyless_wrong_arg_test.dart
diff --git a/tests/language_2/constructor_call_as_function_test.dart b/tests/language_2/constructor/call_as_function_test.dart
similarity index 100%
rename from tests/language_2/constructor_call_as_function_test.dart
rename to tests/language_2/constructor/call_as_function_test.dart
diff --git a/tests/language_2/constructor_call_wrong_argument_count_runtime_test.dart b/tests/language_2/constructor/call_wrong_argument_count_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_call_wrong_argument_count_runtime_test.dart
rename to tests/language_2/constructor/call_wrong_argument_count_runtime_test.dart
diff --git a/tests/language_2/constructor_call_wrong_argument_count_test.dart b/tests/language_2/constructor/call_wrong_argument_count_test.dart
similarity index 100%
rename from tests/language_2/constructor_call_wrong_argument_count_test.dart
rename to tests/language_2/constructor/call_wrong_argument_count_test.dart
diff --git a/tests/language_2/constructor10_runtime_test.dart b/tests/language_2/constructor/constructor10_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor10_runtime_test.dart
rename to tests/language_2/constructor/constructor10_runtime_test.dart
diff --git a/tests/language_2/constructor10_test.dart b/tests/language_2/constructor/constructor10_test.dart
similarity index 100%
rename from tests/language_2/constructor10_test.dart
rename to tests/language_2/constructor/constructor10_test.dart
diff --git a/tests/language_2/constructor11_test.dart b/tests/language_2/constructor/constructor11_test.dart
similarity index 100%
rename from tests/language_2/constructor11_test.dart
rename to tests/language_2/constructor/constructor11_test.dart
diff --git a/tests/language_2/constructor12_test.dart b/tests/language_2/constructor/constructor12_test.dart
similarity index 100%
rename from tests/language_2/constructor12_test.dart
rename to tests/language_2/constructor/constructor12_test.dart
diff --git a/tests/language_2/constructor13_runtime_test.dart b/tests/language_2/constructor/constructor13_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor13_runtime_test.dart
rename to tests/language_2/constructor/constructor13_runtime_test.dart
diff --git a/tests/language_2/constructor13_test.dart b/tests/language_2/constructor/constructor13_test.dart
similarity index 100%
rename from tests/language_2/constructor13_test.dart
rename to tests/language_2/constructor/constructor13_test.dart
diff --git a/tests/language_2/constructor2_test.dart b/tests/language_2/constructor/constructor2_test.dart
similarity index 100%
rename from tests/language_2/constructor2_test.dart
rename to tests/language_2/constructor/constructor2_test.dart
diff --git a/tests/language_2/constructor3_test.dart b/tests/language_2/constructor/constructor3_test.dart
similarity index 100%
rename from tests/language_2/constructor3_test.dart
rename to tests/language_2/constructor/constructor3_test.dart
diff --git a/tests/language_2/constructor4_test.dart b/tests/language_2/constructor/constructor4_test.dart
similarity index 100%
rename from tests/language_2/constructor4_test.dart
rename to tests/language_2/constructor/constructor4_test.dart
diff --git a/tests/language_2/constructor5_test.dart b/tests/language_2/constructor/constructor5_test.dart
similarity index 100%
rename from tests/language_2/constructor5_test.dart
rename to tests/language_2/constructor/constructor5_test.dart
diff --git a/tests/language_2/constructor6_test.dart b/tests/language_2/constructor/constructor6_test.dart
similarity index 100%
rename from tests/language_2/constructor6_test.dart
rename to tests/language_2/constructor/constructor6_test.dart
diff --git a/tests/language_2/constructor7_test.dart b/tests/language_2/constructor/constructor7_test.dart
similarity index 100%
rename from tests/language_2/constructor7_test.dart
rename to tests/language_2/constructor/constructor7_test.dart
diff --git a/tests/language_2/constructor8_test.dart b/tests/language_2/constructor/constructor8_test.dart
similarity index 100%
rename from tests/language_2/constructor8_test.dart
rename to tests/language_2/constructor/constructor8_test.dart
diff --git a/tests/language_2/constructor9_runtime_test.dart b/tests/language_2/constructor/constructor9_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor9_runtime_test.dart
rename to tests/language_2/constructor/constructor9_runtime_test.dart
diff --git a/tests/language_2/constructor9_test.dart b/tests/language_2/constructor/constructor9_test.dart
similarity index 100%
rename from tests/language_2/constructor9_test.dart
rename to tests/language_2/constructor/constructor9_test.dart
diff --git a/tests/language_2/constructor_test.dart b/tests/language_2/constructor/constructor_test.dart
similarity index 100%
rename from tests/language_2/constructor_test.dart
rename to tests/language_2/constructor/constructor_test.dart
diff --git a/tests/language_2/cyclic_constructor_test.dart b/tests/language_2/constructor/cyclic_constructor_test.dart
similarity index 100%
rename from tests/language_2/cyclic_constructor_test.dart
rename to tests/language_2/constructor/cyclic_constructor_test.dart
diff --git a/tests/language_2/cyclic_constructor_runtime_test.dart b/tests/language_2/constructor/cyclic_runtime_test.dart
similarity index 100%
rename from tests/language_2/cyclic_constructor_runtime_test.dart
rename to tests/language_2/constructor/cyclic_runtime_test.dart
diff --git a/tests/language_2/default_class_implicit_constructor_test.dart b/tests/language_2/constructor/default_class_implicit_constructor_test.dart
similarity index 100%
rename from tests/language_2/default_class_implicit_constructor_test.dart
rename to tests/language_2/constructor/default_class_implicit_constructor_test.dart
diff --git a/tests/language_2/default_factory2_runtime_test.dart b/tests/language_2/constructor/default_factory2_runtime_test.dart
similarity index 100%
rename from tests/language_2/default_factory2_runtime_test.dart
rename to tests/language_2/constructor/default_factory2_runtime_test.dart
diff --git a/tests/language_2/default_factory2_test.dart b/tests/language_2/constructor/default_factory2_test.dart
similarity index 100%
rename from tests/language_2/default_factory2_test.dart
rename to tests/language_2/constructor/default_factory2_test.dart
diff --git a/tests/language_2/default_factory3_test.dart b/tests/language_2/constructor/default_factory3_test.dart
similarity index 100%
rename from tests/language_2/default_factory3_test.dart
rename to tests/language_2/constructor/default_factory3_test.dart
diff --git a/tests/language_2/default_factory_library.dart b/tests/language_2/constructor/default_factory_library.dart
similarity index 100%
rename from tests/language_2/default_factory_library.dart
rename to tests/language_2/constructor/default_factory_library.dart
diff --git a/tests/language_2/default_factory_library_test.dart b/tests/language_2/constructor/default_factory_library_test.dart
similarity index 100%
rename from tests/language_2/default_factory_library_test.dart
rename to tests/language_2/constructor/default_factory_library_test.dart
diff --git a/tests/language_2/default_factory_runtime_test.dart b/tests/language_2/constructor/default_factory_runtime_test.dart
similarity index 100%
rename from tests/language_2/default_factory_runtime_test.dart
rename to tests/language_2/constructor/default_factory_runtime_test.dart
diff --git a/tests/language_2/default_factory_test.dart b/tests/language_2/constructor/default_factory_test.dart
similarity index 100%
rename from tests/language_2/default_factory_test.dart
rename to tests/language_2/constructor/default_factory_test.dart
diff --git a/tests/language_2/constructor_default_test.dart b/tests/language_2/constructor/default_test.dart
similarity index 100%
rename from tests/language_2/constructor_default_test.dart
rename to tests/language_2/constructor/default_test.dart
diff --git a/tests/language_2/constructor_duplicate_final_test.dart b/tests/language_2/constructor/duplicate_final_test.dart
similarity index 100%
rename from tests/language_2/constructor_duplicate_final_test.dart
rename to tests/language_2/constructor/duplicate_final_test.dart
diff --git a/tests/language_2/constructor_duplicate_initializers_runtime_test.dart b/tests/language_2/constructor/duplicate_initializers_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_duplicate_initializers_runtime_test.dart
rename to tests/language_2/constructor/duplicate_initializers_runtime_test.dart
diff --git a/tests/language_2/constructor_duplicate_initializers_test.dart b/tests/language_2/constructor/duplicate_initializers_test.dart
similarity index 100%
rename from tests/language_2/constructor_duplicate_initializers_test.dart
rename to tests/language_2/constructor/duplicate_initializers_test.dart
diff --git a/tests/language_2/duplicate_constructor_runtime_test.dart b/tests/language_2/constructor/duplicate_runtime_test.dart
similarity index 100%
rename from tests/language_2/duplicate_constructor_runtime_test.dart
rename to tests/language_2/constructor/duplicate_runtime_test.dart
diff --git a/tests/language_2/duplicate_constructor_test.dart b/tests/language_2/constructor/duplicate_test.dart
similarity index 100%
rename from tests/language_2/duplicate_constructor_test.dart
rename to tests/language_2/constructor/duplicate_test.dart
diff --git a/tests/language_2/evaluation_redirecting_constructor_test.dart b/tests/language_2/constructor/evaluation_redirecting_constructor_test.dart
similarity index 100%
rename from tests/language_2/evaluation_redirecting_constructor_test.dart
rename to tests/language_2/constructor/evaluation_redirecting_constructor_test.dart
diff --git a/tests/language_2/example_constructor_test.dart b/tests/language_2/constructor/example_constructor_test.dart
similarity index 100%
rename from tests/language_2/example_constructor_test.dart
rename to tests/language_2/constructor/example_constructor_test.dart
diff --git a/tests/language_2/forwarding_factory_constructor_default_values_test.dart b/tests/language_2/constructor/forwarding_factory_constructor_default_values_test.dart
similarity index 100%
rename from tests/language_2/forwarding_factory_constructor_default_values_test.dart
rename to tests/language_2/constructor/forwarding_factory_constructor_default_values_test.dart
diff --git a/tests/language_2/implicit_super_constructor_call_test.dart b/tests/language_2/constructor/implicit_super_constructor_call_test.dart
similarity index 100%
rename from tests/language_2/implicit_super_constructor_call_test.dart
rename to tests/language_2/constructor/implicit_super_constructor_call_test.dart
diff --git a/tests/language_2/implicit_super_constructor_test.dart b/tests/language_2/constructor/implicit_super_constructor_test.dart
similarity index 100%
rename from tests/language_2/implicit_super_constructor_test.dart
rename to tests/language_2/constructor/implicit_super_constructor_test.dart
diff --git a/tests/language_2/inference_super_constructor_call_test.dart b/tests/language_2/constructor/inference_super_constructor_call_test.dart
similarity index 100%
rename from tests/language_2/inference_super_constructor_call_test.dart
rename to tests/language_2/constructor/inference_super_constructor_call_test.dart
diff --git a/tests/language_2/constructor_initializer_test.dart b/tests/language_2/constructor/initializer_test.dart
similarity index 100%
rename from tests/language_2/constructor_initializer_test.dart
rename to tests/language_2/constructor/initializer_test.dart
diff --git a/tests/language_2/missing_const_constructor_test.dart b/tests/language_2/constructor/missing_const_constructor_test.dart
similarity index 100%
rename from tests/language_2/missing_const_constructor_test.dart
rename to tests/language_2/constructor/missing_const_constructor_test.dart
diff --git a/tests/language_2/multiple_field_assignment_constructor_test.dart b/tests/language_2/constructor/multiple_field_assignment_constructor_test.dart
similarity index 96%
rename from tests/language_2/multiple_field_assignment_constructor_test.dart
rename to tests/language_2/constructor/multiple_field_assignment_constructor_test.dart
index 912cc546ee4..7292e80657c 100644
--- a/tests/language_2/multiple_field_assignment_constructor_test.dart
+++ b/tests/language_2/constructor/multiple_field_assignment_constructor_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 var a = [null];
 
diff --git a/tests/language_2/constructor_name_clash_lib.dart b/tests/language_2/constructor/name_clash_lib.dart
similarity index 100%
rename from tests/language_2/constructor_name_clash_lib.dart
rename to tests/language_2/constructor/name_clash_lib.dart
diff --git a/tests/language_2/constructor_name_clash_test.dart b/tests/language_2/constructor/name_clash_test.dart
similarity index 89%
rename from tests/language_2/constructor_name_clash_test.dart
rename to tests/language_2/constructor/name_clash_test.dart
index 25432ecb73c..e7681efcb38 100644
--- a/tests/language_2/constructor_name_clash_test.dart
+++ b/tests/language_2/constructor/name_clash_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:expect/expect.dart';
-import 'constructor_name_clash_lib.dart' as lib;
+import 'name_clash_lib.dart' as lib;
 
 class A extends lib.A {
   A() {
diff --git a/tests/language_2/constructor_name_test.dart b/tests/language_2/constructor/name_test.dart
similarity index 100%
rename from tests/language_2/constructor_name_test.dart
rename to tests/language_2/constructor/name_test.dart
diff --git a/tests/language_2/constructor_named_arguments_test.dart b/tests/language_2/constructor/named_arguments_test.dart
similarity index 100%
rename from tests/language_2/constructor_named_arguments_test.dart
rename to tests/language_2/constructor/named_arguments_test.dart
diff --git a/tests/language_2/named_constructor_test.dart b/tests/language_2/constructor/named_constructor_test.dart
similarity index 98%
rename from tests/language_2/named_constructor_test.dart
rename to tests/language_2/constructor/named_constructor_test.dart
index 92f91e4e15d..915f1474f5f 100644
--- a/tests/language_2/named_constructor_test.dart
+++ b/tests/language_2/constructor/named_constructor_test.dart
@@ -5,7 +5,7 @@
 library named_constructor_test;
 
 import 'package:expect/expect.dart';
-import 'named_constructor_lib.dart' as prefix;
+import 'named_lib.dart' as prefix;
 
 class Class<T> {
   final int value;
diff --git a/tests/language_2/named_constructor_lib.dart b/tests/language_2/constructor/named_lib.dart
similarity index 100%
rename from tests/language_2/named_constructor_lib.dart
rename to tests/language_2/constructor/named_lib.dart
diff --git a/tests/language_2/named_constructor_runtime_test.dart b/tests/language_2/constructor/named_runtime_test.dart
similarity index 97%
rename from tests/language_2/named_constructor_runtime_test.dart
rename to tests/language_2/constructor/named_runtime_test.dart
index ad25d4c1390..815b05be60e 100644
--- a/tests/language_2/named_constructor_runtime_test.dart
+++ b/tests/language_2/constructor/named_runtime_test.dart
@@ -8,7 +8,7 @@
 library named_constructor_test;
 
 import 'package:expect/expect.dart';
-import 'named_constructor_lib.dart' as prefix;
+import 'named_lib.dart' as prefix;
 
 class Class<T> {
   final int value;
diff --git a/tests/language_2/no_such_constructor_runtime_test.dart b/tests/language_2/constructor/no_such_constructor_runtime_test.dart
similarity index 100%
rename from tests/language_2/no_such_constructor_runtime_test.dart
rename to tests/language_2/constructor/no_such_constructor_runtime_test.dart
diff --git a/tests/language_2/no_such_constructor_test.dart b/tests/language_2/constructor/no_such_constructor_test.dart
similarity index 100%
rename from tests/language_2/no_such_constructor_test.dart
rename to tests/language_2/constructor/no_such_constructor_test.dart
diff --git a/tests/language_2/non_const_constructor_without_body_test.dart b/tests/language_2/constructor/non_const_constructor_without_body_test.dart
similarity index 100%
rename from tests/language_2/non_const_constructor_without_body_test.dart
rename to tests/language_2/constructor/non_const_constructor_without_body_test.dart
diff --git a/tests/language_2/non_parameterized_factory2_test.dart b/tests/language_2/constructor/non_parameterized_factory2_test.dart
similarity index 100%
rename from tests/language_2/non_parameterized_factory2_test.dart
rename to tests/language_2/constructor/non_parameterized_factory2_test.dart
diff --git a/tests/language_2/non_parameterized_factory_test.dart b/tests/language_2/constructor/non_parameterized_factory_test.dart
similarity index 100%
rename from tests/language_2/non_parameterized_factory_test.dart
rename to tests/language_2/constructor/non_parameterized_factory_test.dart
diff --git a/tests/language_2/constructor_redirect2_runtime_test.dart b/tests/language_2/constructor/redirect2_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect2_runtime_test.dart
rename to tests/language_2/constructor/redirect2_runtime_test.dart
diff --git a/tests/language_2/constructor_redirect2_test.dart b/tests/language_2/constructor/redirect2_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect2_test.dart
rename to tests/language_2/constructor/redirect2_test.dart
diff --git a/tests/language_2/constructor_redirect_cycle_runtime_test.dart b/tests/language_2/constructor/redirect_cycle_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect_cycle_runtime_test.dart
rename to tests/language_2/constructor/redirect_cycle_runtime_test.dart
diff --git a/tests/language_2/constructor_redirect_cycle_test.dart b/tests/language_2/constructor/redirect_cycle_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect_cycle_test.dart
rename to tests/language_2/constructor/redirect_cycle_test.dart
diff --git a/tests/language_2/constructor_redirect_indirect_cycle_runtime_test.dart b/tests/language_2/constructor/redirect_indirect_cycle_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect_indirect_cycle_runtime_test.dart
rename to tests/language_2/constructor/redirect_indirect_cycle_runtime_test.dart
diff --git a/tests/language_2/constructor_redirect_indirect_cycle_test.dart b/tests/language_2/constructor/redirect_indirect_cycle_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect_indirect_cycle_test.dart
rename to tests/language_2/constructor/redirect_indirect_cycle_test.dart
diff --git a/tests/language_2/constructor_redirect_runtime_test.dart b/tests/language_2/constructor/redirect_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect_runtime_test.dart
rename to tests/language_2/constructor/redirect_runtime_test.dart
diff --git a/tests/language_2/constructor_redirect_test.dart b/tests/language_2/constructor/redirect_test.dart
similarity index 100%
rename from tests/language_2/constructor_redirect_test.dart
rename to tests/language_2/constructor/redirect_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_10_test.dart b/tests/language_2/constructor/reference_runtime_10_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_10_test.dart
rename to tests/language_2/constructor/reference_runtime_10_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_11_test.dart b/tests/language_2/constructor/reference_runtime_11_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_11_test.dart
rename to tests/language_2/constructor/reference_runtime_11_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_12_test.dart b/tests/language_2/constructor/reference_runtime_12_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_12_test.dart
rename to tests/language_2/constructor/reference_runtime_12_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_1_test.dart b/tests/language_2/constructor/reference_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_1_test.dart
rename to tests/language_2/constructor/reference_runtime_1_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_2_test.dart b/tests/language_2/constructor/reference_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_2_test.dart
rename to tests/language_2/constructor/reference_runtime_2_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_3_test.dart b/tests/language_2/constructor/reference_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_3_test.dart
rename to tests/language_2/constructor/reference_runtime_3_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_4_test.dart b/tests/language_2/constructor/reference_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_4_test.dart
rename to tests/language_2/constructor/reference_runtime_4_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_5_test.dart b/tests/language_2/constructor/reference_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_5_test.dart
rename to tests/language_2/constructor/reference_runtime_5_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_6_test.dart b/tests/language_2/constructor/reference_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_6_test.dart
rename to tests/language_2/constructor/reference_runtime_6_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_7_test.dart b/tests/language_2/constructor/reference_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_7_test.dart
rename to tests/language_2/constructor/reference_runtime_7_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_8_test.dart b/tests/language_2/constructor/reference_runtime_8_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_8_test.dart
rename to tests/language_2/constructor/reference_runtime_8_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_9_test.dart b/tests/language_2/constructor/reference_runtime_9_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_9_test.dart
rename to tests/language_2/constructor/reference_runtime_9_test.dart
diff --git a/tests/language_2/constructor_reference_runtime_test.dart b/tests/language_2/constructor/reference_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_runtime_test.dart
rename to tests/language_2/constructor/reference_runtime_test.dart
diff --git a/tests/language_2/constructor_reference_test.dart b/tests/language_2/constructor/reference_test.dart
similarity index 100%
rename from tests/language_2/constructor_reference_test.dart
rename to tests/language_2/constructor/reference_test.dart
diff --git a/tests/language_2/constructor_return_runtime_test.dart b/tests/language_2/constructor/return_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_return_runtime_test.dart
rename to tests/language_2/constructor/return_runtime_test.dart
diff --git a/tests/language_2/constructor_return_test.dart b/tests/language_2/constructor/return_test.dart
similarity index 100%
rename from tests/language_2/constructor_return_test.dart
rename to tests/language_2/constructor/return_test.dart
diff --git a/tests/language_2/constructor_setter_test.dart b/tests/language_2/constructor/setter_test.dart
similarity index 100%
rename from tests/language_2/constructor_setter_test.dart
rename to tests/language_2/constructor/setter_test.dart
diff --git a/tests/language_2/constructor_type_parameter_runtime_test.dart b/tests/language_2/constructor/type_parameter_runtime_test.dart
similarity index 100%
rename from tests/language_2/constructor_type_parameter_runtime_test.dart
rename to tests/language_2/constructor/type_parameter_runtime_test.dart
diff --git a/tests/language_2/constructor_type_parameter_test.dart b/tests/language_2/constructor/type_parameter_test.dart
similarity index 100%
rename from tests/language_2/constructor_type_parameter_test.dart
rename to tests/language_2/constructor/type_parameter_test.dart
diff --git a/tests/language_2/unresolved_default_constructor_test.dart b/tests/language_2/constructor/unresolved_default_constructor_test.dart
similarity index 100%
rename from tests/language_2/unresolved_default_constructor_test.dart
rename to tests/language_2/constructor/unresolved_default_constructor_test.dart
diff --git a/tests/language_2/unresolved_default_constructor_runtime_test.dart b/tests/language_2/constructor/unresolved_default_runtime_test.dart
similarity index 100%
rename from tests/language_2/unresolved_default_constructor_runtime_test.dart
rename to tests/language_2/constructor/unresolved_default_runtime_test.dart
diff --git a/tests/language_2/unresolved_in_factory_test.dart b/tests/language_2/constructor/unresolved_in_factory_test.dart
similarity index 100%
rename from tests/language_2/unresolved_in_factory_test.dart
rename to tests/language_2/constructor/unresolved_in_factory_test.dart
diff --git a/tests/language_2/constructor_with_mixin_test.dart b/tests/language_2/constructor/with_mixin_test.dart
similarity index 100%
rename from tests/language_2/constructor_with_mixin_test.dart
rename to tests/language_2/constructor/with_mixin_test.dart
diff --git a/tests/language_2/constructor_with_type_parameters_test.dart b/tests/language_2/constructor/with_type_parameters_test.dart
similarity index 100%
rename from tests/language_2/constructor_with_type_parameters_test.dart
rename to tests/language_2/constructor/with_type_parameters_test.dart
diff --git a/tests/language_2/covariant_test.dart b/tests/language_2/covariant/covariant_test.dart
similarity index 100%
rename from tests/language_2/covariant_test.dart
rename to tests/language_2/covariant/covariant_test.dart
diff --git a/tests/language_2/covariance_field_test.dart b/tests/language_2/covariant/field_test.dart
similarity index 100%
rename from tests/language_2/covariance_field_test.dart
rename to tests/language_2/covariant/field_test.dart
diff --git a/tests/language_2/covariance_method_test.dart b/tests/language_2/covariant/method_test.dart
similarity index 100%
rename from tests/language_2/covariance_method_test.dart
rename to tests/language_2/covariant/method_test.dart
diff --git a/tests/language_2/covariant_override_test.dart b/tests/language_2/covariant/override_test.dart
similarity index 100%
rename from tests/language_2/covariant_override_test.dart
rename to tests/language_2/covariant/override_test.dart
diff --git a/tests/language_2/covariant_return_type_test.dart b/tests/language_2/covariant/return_type_test.dart
similarity index 100%
rename from tests/language_2/covariant_return_type_test.dart
rename to tests/language_2/covariant/return_type_test.dart
diff --git a/tests/language_2/covariance_setter_test.dart b/tests/language_2/covariant/setter_test.dart
similarity index 100%
rename from tests/language_2/covariance_setter_test.dart
rename to tests/language_2/covariant/setter_test.dart
diff --git a/tests/language_2/covariant_subtyping_tearoff1_test.dart b/tests/language_2/covariant/subtyping_tearoff1_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_tearoff1_test.dart
rename to tests/language_2/covariant/subtyping_tearoff1_test.dart
diff --git a/tests/language_2/covariant_subtyping_tearoff2_test.dart b/tests/language_2/covariant/subtyping_tearoff2_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_tearoff2_test.dart
rename to tests/language_2/covariant/subtyping_tearoff2_test.dart
diff --git a/tests/language_2/covariant_subtyping_tearoff3_test.dart b/tests/language_2/covariant/subtyping_tearoff3_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_tearoff3_test.dart
rename to tests/language_2/covariant/subtyping_tearoff3_test.dart
diff --git a/tests/language_2/covariant_subtyping_test.dart b/tests/language_2/covariant/subtyping_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_test.dart
rename to tests/language_2/covariant/subtyping_test.dart
diff --git a/tests/language_2/covariant_subtyping_unsafe_call1_test.dart b/tests/language_2/covariant/subtyping_unsafe_call1_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_unsafe_call1_test.dart
rename to tests/language_2/covariant/subtyping_unsafe_call1_test.dart
diff --git a/tests/language_2/covariant_subtyping_unsafe_call2_test.dart b/tests/language_2/covariant/subtyping_unsafe_call2_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_unsafe_call2_test.dart
rename to tests/language_2/covariant/subtyping_unsafe_call2_test.dart
diff --git a/tests/language_2/covariant_subtyping_unsafe_call3_test.dart b/tests/language_2/covariant/subtyping_unsafe_call3_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_unsafe_call3_test.dart
rename to tests/language_2/covariant/subtyping_unsafe_call3_test.dart
diff --git a/tests/language_2/covariant_subtyping_with_mixin_test.dart b/tests/language_2/covariant/subtyping_with_mixin_test.dart
similarity index 100%
rename from tests/language_2/covariant_subtyping_with_mixin_test.dart
rename to tests/language_2/covariant/subtyping_with_mixin_test.dart
diff --git a/tests/language_2/covariant_tear_off_type_test.dart b/tests/language_2/covariant/tear_off_type_test.dart
similarity index 100%
rename from tests/language_2/covariant_tear_off_type_test.dart
rename to tests/language_2/covariant/tear_off_type_test.dart
diff --git a/tests/language_2/covariance_type_parameter_test.dart b/tests/language_2/covariant/type_parameter_test.dart
similarity index 100%
rename from tests/language_2/covariance_type_parameter_test.dart
rename to tests/language_2/covariant/type_parameter_test.dart
diff --git a/tests/language_2/deferred_call_empty_before_load_lib.dart b/tests/language_2/deferred/call_empty_before_load_lib.dart
similarity index 100%
rename from tests/language_2/deferred_call_empty_before_load_lib.dart
rename to tests/language_2/deferred/call_empty_before_load_lib.dart
diff --git a/tests/language_2/deferred_call_empty_before_load_test.dart b/tests/language_2/deferred/call_empty_before_load_test.dart
similarity index 87%
rename from tests/language_2/deferred_call_empty_before_load_test.dart
rename to tests/language_2/deferred/call_empty_before_load_test.dart
index c241c6a90b4..9a13981bac7 100644
--- a/tests/language_2/deferred_call_empty_before_load_test.dart
+++ b/tests/language_2/deferred/call_empty_before_load_test.dart
@@ -6,7 +6,7 @@
 // trigger an error if the corresponding deferred library has not been loaded.
 
 import "package:expect/expect.dart";
-import "deferred_call_empty_before_load_lib.dart" deferred as lib1;
+import "call_empty_before_load_lib.dart" deferred as lib1;
 
 main() {
   Expect.throws(() => lib1.thefun());
diff --git a/tests/language_2/deferred_closurize_load_library_lib.dart b/tests/language_2/deferred/closurize_load_library_lib.dart
similarity index 100%
rename from tests/language_2/deferred_closurize_load_library_lib.dart
rename to tests/language_2/deferred/closurize_load_library_lib.dart
diff --git a/tests/language_2/deferred_closurize_load_library_test.dart b/tests/language_2/deferred/closurize_load_library_test.dart
similarity index 86%
rename from tests/language_2/deferred_closurize_load_library_test.dart
rename to tests/language_2/deferred/closurize_load_library_test.dart
index 6c90cb6147f..0f45d3a523b 100644
--- a/tests/language_2/deferred_closurize_load_library_test.dart
+++ b/tests/language_2/deferred/closurize_load_library_test.dart
@@ -5,7 +5,7 @@
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 
-import "deferred_closurize_load_library_lib.dart" deferred as lib;
+import "closurize_load_library_lib.dart" deferred as lib;
 
 void main() {
   var x = lib.loadLibrary;
diff --git a/tests/language_2/deferred_constant_list_lib.dart b/tests/language_2/deferred/constant_list_lib.dart
similarity index 100%
rename from tests/language_2/deferred_constant_list_lib.dart
rename to tests/language_2/deferred/constant_list_lib.dart
diff --git a/tests/language_2/deferred_constant_list_test.dart b/tests/language_2/deferred/constant_list_test.dart
similarity index 89%
rename from tests/language_2/deferred_constant_list_test.dart
rename to tests/language_2/deferred/constant_list_test.dart
index ec3dc10fc86..01ee8d63bbf 100644
--- a/tests/language_2/deferred_constant_list_test.dart
+++ b/tests/language_2/deferred/constant_list_test.dart
@@ -5,7 +5,7 @@
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 
-import "deferred_constant_list_lib.dart" deferred as lib;
+import "constant_list_lib.dart" deferred as lib;
 
 void main() {
   asyncStart();
diff --git a/tests/language_2/deferred_constraints_lib.dart b/tests/language_2/deferred/constraints_lib.dart
similarity index 100%
rename from tests/language_2/deferred_constraints_lib.dart
rename to tests/language_2/deferred/constraints_lib.dart
diff --git a/tests/language_2/deferred_constraints_lib2.dart b/tests/language_2/deferred/constraints_lib2.dart
similarity index 100%
rename from tests/language_2/deferred_constraints_lib2.dart
rename to tests/language_2/deferred/constraints_lib2.dart
diff --git a/tests/language_2/deferred_constraints_type_annotation_test.dart b/tests/language_2/deferred/constraints_type_annotation_test.dart
similarity index 94%
rename from tests/language_2/deferred_constraints_type_annotation_test.dart
rename to tests/language_2/deferred/constraints_type_annotation_test.dart
index b7a519a0e60..9d86ccbc32c 100644
--- a/tests/language_2/deferred_constraints_type_annotation_test.dart
+++ b/tests/language_2/deferred/constraints_type_annotation_test.dart
@@ -5,8 +5,8 @@
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 
-import "deferred_constraints_lib.dart" deferred as lib;
-import "deferred_constraints_lib.dart" as lib2; //# type_annotation_non_deferred: ok
+import "constraints_lib.dart" deferred as lib;
+import "constraints_lib.dart" as lib2; //# type_annotation_non_deferred: ok
 
 class F {}
 
diff --git a/tests/language_2/deferred_duplicate_prefix2_runtime_test.dart b/tests/language_2/deferred/duplicate_prefix1_runtime_test.dart
similarity index 86%
rename from tests/language_2/deferred_duplicate_prefix2_runtime_test.dart
rename to tests/language_2/deferred/duplicate_prefix1_runtime_test.dart
index 8717c6e94bc..0feaa2efbc8 100644
--- a/tests/language_2/deferred_duplicate_prefix2_runtime_test.dart
+++ b/tests/language_2/deferred/duplicate_prefix1_runtime_test.dart
@@ -5,7 +5,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import "prefix_constraints_lib2.dart" as lib;
 
-import "deferred_prefix_constraints_lib2.dart" as lib;
 
 void main() {}
diff --git a/tests/language_2/deferred_duplicate_prefix1_test.dart b/tests/language_2/deferred/duplicate_prefix1_test.dart
similarity index 61%
rename from tests/language_2/deferred_duplicate_prefix1_test.dart
rename to tests/language_2/deferred/duplicate_prefix1_test.dart
index b208717f5a8..7668c0faaee 100644
--- a/tests/language_2/deferred_duplicate_prefix1_test.dart
+++ b/tests/language_2/deferred/duplicate_prefix1_test.dart
@@ -2,11 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import "deferred_prefix_constraints_lib2.dart" as lib;
-import "deferred_prefix_constraints_lib.dart" deferred as lib;
-//                                            ^^^^^^^^
+import "prefix_constraints_lib2.dart" as lib;
+import "prefix_constraints_lib.dart" deferred as lib;
+//                                   ^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.SHARED_DEFERRED_PREFIX
-//                                                        ^
+//                                               ^
 // [cfe] Can't use the name 'lib' for a deferred library, as the name is used elsewhere.
 
 void main() {}
diff --git a/tests/language_2/deferred_duplicate_prefix1_runtime_test.dart b/tests/language_2/deferred/duplicate_prefix2_runtime_test.dart
similarity index 86%
rename from tests/language_2/deferred_duplicate_prefix1_runtime_test.dart
rename to tests/language_2/deferred/duplicate_prefix2_runtime_test.dart
index 5466486e2fa..482f8280e83 100644
--- a/tests/language_2/deferred_duplicate_prefix1_runtime_test.dart
+++ b/tests/language_2/deferred/duplicate_prefix2_runtime_test.dart
@@ -5,7 +5,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import "deferred_prefix_constraints_lib2.dart" as lib;
 
+import "prefix_constraints_lib2.dart" as lib;
 
 void main() {}
diff --git a/tests/language_2/deferred_duplicate_prefix2_test.dart b/tests/language_2/deferred/duplicate_prefix2_test.dart
similarity index 61%
rename from tests/language_2/deferred_duplicate_prefix2_test.dart
rename to tests/language_2/deferred/duplicate_prefix2_test.dart
index 2c505ca0890..cee67e0b3e0 100644
--- a/tests/language_2/deferred_duplicate_prefix2_test.dart
+++ b/tests/language_2/deferred/duplicate_prefix2_test.dart
@@ -2,11 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import "deferred_prefix_constraints_lib.dart" deferred as lib;
-//                                            ^^^^^^^^
+import "prefix_constraints_lib.dart" deferred as lib;
+//                                   ^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.SHARED_DEFERRED_PREFIX
-//                                                        ^
+//                                               ^
 // [cfe] Can't use the name 'lib' for a deferred library, as the name is used elsewhere.
-import "deferred_prefix_constraints_lib2.dart" as lib;
+import "prefix_constraints_lib2.dart" as lib;
 
 void main() {}
diff --git a/tests/language_2/deferred_duplicate_prefix3_runtime_test.dart b/tests/language_2/deferred/duplicate_prefix3_runtime_test.dart
similarity index 100%
rename from tests/language_2/deferred_duplicate_prefix3_runtime_test.dart
rename to tests/language_2/deferred/duplicate_prefix3_runtime_test.dart
diff --git a/tests/language_2/deferred_duplicate_prefix3_test.dart b/tests/language_2/deferred/duplicate_prefix3_test.dart
similarity index 59%
rename from tests/language_2/deferred_duplicate_prefix3_test.dart
rename to tests/language_2/deferred/duplicate_prefix3_test.dart
index 3b3b3e88fac..ee80c82fa32 100644
--- a/tests/language_2/deferred_duplicate_prefix3_test.dart
+++ b/tests/language_2/deferred/duplicate_prefix3_test.dart
@@ -2,13 +2,13 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import "deferred_prefix_constraints_lib.dart" deferred as lib;
-//                                            ^^^^^^^^
+import "prefix_constraints_lib.dart" deferred as lib;
+//                                   ^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.SHARED_DEFERRED_PREFIX
-import "deferred_prefix_constraints_lib2.dart" deferred as lib;
-//                                             ^^^^^^^^
+import "prefix_constraints_lib2.dart" deferred as lib;
+//                                    ^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.SHARED_DEFERRED_PREFIX
-//                                                         ^
+//                                                ^
 // [cfe] Can't use the name 'lib' for a deferred library, as the name is used elsewhere.
 
 void main() {}
diff --git a/tests/language_2/deferred_function_type_lib.dart b/tests/language_2/deferred/function_type_lib.dart
similarity index 100%
rename from tests/language_2/deferred_function_type_lib.dart
rename to tests/language_2/deferred/function_type_lib.dart
diff --git a/tests/language_2/deferred_function_type_test.dart b/tests/language_2/deferred/function_type_test.dart
similarity index 83%
rename from tests/language_2/deferred_function_type_test.dart
rename to tests/language_2/deferred/function_type_test.dart
index 8957a73c6a4..49e151b6712 100644
--- a/tests/language_2/deferred_function_type_test.dart
+++ b/tests/language_2/deferred/function_type_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'deferred_function_type_lib.dart' deferred as lib;
+import 'function_type_lib.dart' deferred as lib;
 
 main() {
   lib.loadLibrary().then((_) {
diff --git a/tests/language_2/deferred_global_lib.dart b/tests/language_2/deferred/global_lib.dart
similarity index 100%
rename from tests/language_2/deferred_global_lib.dart
rename to tests/language_2/deferred/global_lib.dart
diff --git a/tests/language_2/deferred_global_test.dart b/tests/language_2/deferred/global_test.dart
similarity index 98%
rename from tests/language_2/deferred_global_test.dart
rename to tests/language_2/deferred/global_test.dart
index 75916c19358..6c3c72830cb 100644
--- a/tests/language_2/deferred_global_test.dart
+++ b/tests/language_2/deferred/global_test.dart
@@ -5,7 +5,7 @@
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 
-import "deferred_global_lib.dart" deferred as lib;
+import "global_lib.dart" deferred as lib;
 
 var nonDeferredGlobal = const {};
 
diff --git a/tests/language_2/deferred_import_core_test.dart b/tests/language_2/deferred/import_core_test.dart
similarity index 100%
rename from tests/language_2/deferred_import_core_test.dart
rename to tests/language_2/deferred/import_core_test.dart
diff --git a/tests/language_2/deferred_inheritance_constraints_lib.dart b/tests/language_2/deferred/inheritance_constraints_lib.dart
similarity index 100%
rename from tests/language_2/deferred_inheritance_constraints_lib.dart
rename to tests/language_2/deferred/inheritance_constraints_lib.dart
diff --git a/tests/language_2/deferred_inheritance_constraints_runtime_test.dart b/tests/language_2/deferred/inheritance_constraints_runtime_test.dart
similarity index 90%
rename from tests/language_2/deferred_inheritance_constraints_runtime_test.dart
rename to tests/language_2/deferred/inheritance_constraints_runtime_test.dart
index 2be0495520e..719a170a8e6 100644
--- a/tests/language_2/deferred_inheritance_constraints_runtime_test.dart
+++ b/tests/language_2/deferred/inheritance_constraints_runtime_test.dart
@@ -6,7 +6,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import "deferred_inheritance_constraints_lib.dart" deferred as lib;
+import "inheritance_constraints_lib.dart" deferred as lib;
 
 class Foo {}
 
diff --git a/tests/language_2/deferred_inheritance_constraints_test.dart b/tests/language_2/deferred/inheritance_constraints_test.dart
similarity index 93%
rename from tests/language_2/deferred_inheritance_constraints_test.dart
rename to tests/language_2/deferred/inheritance_constraints_test.dart
index 392335e286a..9dd18f2595e 100644
--- a/tests/language_2/deferred_inheritance_constraints_test.dart
+++ b/tests/language_2/deferred/inheritance_constraints_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import "deferred_inheritance_constraints_lib.dart" deferred as lib;
+import "inheritance_constraints_lib.dart" deferred as lib;
 
 class Foo {}
 
diff --git a/tests/language_2/deferred_inlined_test.dart b/tests/language_2/deferred/inlined_test.dart
similarity index 93%
rename from tests/language_2/deferred_inlined_test.dart
rename to tests/language_2/deferred/inlined_test.dart
index 19b7cb7851c..5aa45b02a11 100644
--- a/tests/language_2/deferred_inlined_test.dart
+++ b/tests/language_2/deferred/inlined_test.dart
@@ -4,7 +4,7 @@
 // VMOptions=--optimization-counter-threshold=10
 
 // Declares foo that returns 42.
-import "deferred_constraints_lib2.dart" deferred as lib;
+import "constraints_lib2.dart" deferred as lib;
 
 import 'package:expect/expect.dart';
 
diff --git a/tests/language_2/deferred_load_constants.dart b/tests/language_2/deferred/load_constants.dart
similarity index 100%
rename from tests/language_2/deferred_load_constants.dart
rename to tests/language_2/deferred/load_constants.dart
diff --git a/tests/language_2/deferred_load_constants_runtime_test.dart b/tests/language_2/deferred/load_constants_runtime_test.dart
similarity index 91%
rename from tests/language_2/deferred_load_constants_runtime_test.dart
rename to tests/language_2/deferred/load_constants_runtime_test.dart
index d4a1b18cec9..97e91a293b0 100644
--- a/tests/language_2/deferred_load_constants_runtime_test.dart
+++ b/tests/language_2/deferred/load_constants_runtime_test.dart
@@ -10,8 +10,8 @@ library deferred_load_constants;
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "deferred_load_constants.dart" deferred as foo;
-import "deferred_load_constants.dart";
+import "load_constants.dart" deferred as foo;
+import "load_constants.dart";
 
 main() {
   asyncStart();
diff --git a/tests/language_2/deferred_load_constants_test.dart b/tests/language_2/deferred/load_constants_test.dart
similarity index 96%
rename from tests/language_2/deferred_load_constants_test.dart
rename to tests/language_2/deferred/load_constants_test.dart
index 7728c7e6c89..a57e24c3852 100644
--- a/tests/language_2/deferred_load_constants_test.dart
+++ b/tests/language_2/deferred/load_constants_test.dart
@@ -7,8 +7,8 @@ library deferred_load_constants;
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "deferred_load_constants.dart" deferred as foo;
-import "deferred_load_constants.dart";
+import "load_constants.dart" deferred as foo;
+import "load_constants.dart";
 
 main() {
   asyncStart();
diff --git a/tests/language_2/deferred_load_inval_code_lib.dart b/tests/language_2/deferred/load_inval_code_lib.dart
similarity index 100%
rename from tests/language_2/deferred_load_inval_code_lib.dart
rename to tests/language_2/deferred/load_inval_code_lib.dart
diff --git a/tests/language_2/deferred_load_inval_code_test.dart b/tests/language_2/deferred/load_inval_code_test.dart
similarity index 92%
rename from tests/language_2/deferred_load_inval_code_test.dart
rename to tests/language_2/deferred/load_inval_code_test.dart
index 486734c74c5..596e0bca675 100644
--- a/tests/language_2/deferred_load_inval_code_test.dart
+++ b/tests/language_2/deferred/load_inval_code_test.dart
@@ -4,7 +4,7 @@
 //
 // VMOptions=--optimization-counter-threshold=100
 
-import "deferred_load_inval_code_lib.dart" deferred as d;
+import "load_inval_code_lib.dart" deferred as d;
 
 bool loaded = false;
 
diff --git a/tests/language_2/deferred_load_library_wrong_args_lib.dart b/tests/language_2/deferred/load_library_wrong_args_lib.dart
similarity index 100%
rename from tests/language_2/deferred_load_library_wrong_args_lib.dart
rename to tests/language_2/deferred/load_library_wrong_args_lib.dart
diff --git a/tests/language_2/deferred_load_library_wrong_args_test.dart b/tests/language_2/deferred/load_library_wrong_args_test.dart
similarity index 80%
rename from tests/language_2/deferred_load_library_wrong_args_test.dart
rename to tests/language_2/deferred/load_library_wrong_args_test.dart
index 1cd2dedf0f7..5f000a82c78 100644
--- a/tests/language_2/deferred_load_library_wrong_args_test.dart
+++ b/tests/language_2/deferred/load_library_wrong_args_test.dart
@@ -1,4 +1,4 @@
-import "deferred_load_library_wrong_args_lib.dart" deferred as lib;
+import "load_library_wrong_args_lib.dart" deferred as lib;
 
 void main() {
   // Loadlibrary should be called without arguments.
diff --git a/tests/language_2/deferred_mixin_lib1.dart b/tests/language_2/deferred/mixin_lib1.dart
similarity index 91%
rename from tests/language_2/deferred_mixin_lib1.dart
rename to tests/language_2/deferred/mixin_lib1.dart
index 37ebd10193e..3b43ffed321 100644
--- a/tests/language_2/deferred_mixin_lib1.dart
+++ b/tests/language_2/deferred/mixin_lib1.dart
@@ -4,8 +4,8 @@
 
 library lib1;
 
-import "deferred_mixin_shared.dart";
-import "deferred_mixin_test.dart";
+import "mixin_shared.dart";
+import "mixin_test.dart";
 
 class Mixin {
   foo() => "lib1.Mixin";
diff --git a/tests/language_2/deferred_mixin_lib2.dart b/tests/language_2/deferred/mixin_lib2.dart
similarity index 89%
rename from tests/language_2/deferred_mixin_lib2.dart
rename to tests/language_2/deferred/mixin_lib2.dart
index f937fc5ae22..32fafef0af8 100644
--- a/tests/language_2/deferred_mixin_lib2.dart
+++ b/tests/language_2/deferred/mixin_lib2.dart
@@ -4,7 +4,7 @@
 
 library lib2;
 
-import "deferred_mixin_shared.dart";
+import "mixin_shared.dart";
 
 class A extends Object with SharedMixin {
   foo() {
diff --git a/tests/language_2/deferred_mixin_shared.dart b/tests/language_2/deferred/mixin_shared.dart
similarity index 100%
rename from tests/language_2/deferred_mixin_shared.dart
rename to tests/language_2/deferred/mixin_shared.dart
diff --git a/tests/language_2/deferred_mixin_test.dart b/tests/language_2/deferred/mixin_test.dart
similarity index 92%
rename from tests/language_2/deferred_mixin_test.dart
rename to tests/language_2/deferred/mixin_test.dart
index 1a46fbc534e..33594b71de4 100644
--- a/tests/language_2/deferred_mixin_test.dart
+++ b/tests/language_2/deferred/mixin_test.dart
@@ -5,8 +5,8 @@
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 
-import "deferred_mixin_lib1.dart" deferred as lib1;
-import "deferred_mixin_lib2.dart" deferred as lib2;
+import "mixin_lib1.dart" deferred as lib1;
+import "mixin_lib2.dart" deferred as lib2;
 
 class NonDeferredMixin {
   foo() => "NonDeferredMixin";
diff --git a/tests/language_2/deferred_no_prefix_runtime_test.dart b/tests/language_2/deferred/no_prefix_runtime_test.dart
similarity index 91%
rename from tests/language_2/deferred_no_prefix_runtime_test.dart
rename to tests/language_2/deferred/no_prefix_runtime_test.dart
index c53588e4e48..1cbab75f7c0 100644
--- a/tests/language_2/deferred_no_prefix_runtime_test.dart
+++ b/tests/language_2/deferred/no_prefix_runtime_test.dart
@@ -6,7 +6,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // Loading a deferred library without prefix is not allowed.
-import "deferred_constraints_lib2.dart"
+import "constraints_lib2.dart"
 
     ;
 
diff --git a/tests/language_2/deferred_no_prefix_test.dart b/tests/language_2/deferred/no_prefix_test.dart
similarity index 91%
rename from tests/language_2/deferred_no_prefix_test.dart
rename to tests/language_2/deferred/no_prefix_test.dart
index 2af5e86e998..ff778e51836 100644
--- a/tests/language_2/deferred_no_prefix_test.dart
+++ b/tests/language_2/deferred/no_prefix_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // Loading a deferred library without prefix is not allowed.
-import "deferred_constraints_lib2.dart"
+import "constraints_lib2.dart"
   deferred
 //^^^^^^^^
 // [analyzer] SYNTACTIC_ERROR.MISSING_PREFIX_IN_DEFERRED_IMPORT
diff --git a/tests/language_2/deferred_no_such_method_lib.dart b/tests/language_2/deferred/no_such_method_lib.dart
similarity index 100%
rename from tests/language_2/deferred_no_such_method_lib.dart
rename to tests/language_2/deferred/no_such_method_lib.dart
diff --git a/tests/language_2/deferred_no_such_method_test.dart b/tests/language_2/deferred/no_such_method_test.dart
similarity index 88%
rename from tests/language_2/deferred_no_such_method_test.dart
rename to tests/language_2/deferred/no_such_method_test.dart
index 5e041208c51..06733196e44 100644
--- a/tests/language_2/deferred_no_such_method_test.dart
+++ b/tests/language_2/deferred/no_such_method_test.dart
@@ -5,7 +5,7 @@
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 
-import "deferred_no_such_method_lib.dart" deferred as lib;
+import "no_such_method_lib.dart" deferred as lib;
 
 void main() {
   asyncStart();
diff --git a/tests/language_2/deferred_not_loaded_check_lib.dart b/tests/language_2/deferred/not_loaded_check_lib.dart
similarity index 100%
rename from tests/language_2/deferred_not_loaded_check_lib.dart
rename to tests/language_2/deferred/not_loaded_check_lib.dart
diff --git a/tests/language_2/deferred_not_loaded_check_test.dart b/tests/language_2/deferred/not_loaded_check_test.dart
similarity index 96%
rename from tests/language_2/deferred_not_loaded_check_test.dart
rename to tests/language_2/deferred/not_loaded_check_test.dart
index 964ab475bb1..44c0fd44698 100644
--- a/tests/language_2/deferred_not_loaded_check_test.dart
+++ b/tests/language_2/deferred/not_loaded_check_test.dart
@@ -5,7 +5,7 @@
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 
-import "deferred_not_loaded_check_lib.dart" deferred as lib;
+import "not_loaded_check_lib.dart" deferred as lib;
 
 // Test that we give appropriate errors when accessing an element that is not
 // yet loaded.
diff --git a/tests/language_2/deferred_only_constant_lib.dart b/tests/language_2/deferred/only_constant_lib.dart
similarity index 100%
rename from tests/language_2/deferred_only_constant_lib.dart
rename to tests/language_2/deferred/only_constant_lib.dart
diff --git a/tests/language_2/deferred_only_constant_test.dart b/tests/language_2/deferred/only_constant_test.dart
similarity index 88%
rename from tests/language_2/deferred_only_constant_test.dart
rename to tests/language_2/deferred/only_constant_test.dart
index cc3f5001271..37d2a2a8e86 100644
--- a/tests/language_2/deferred_only_constant_test.dart
+++ b/tests/language_2/deferred/only_constant_test.dart
@@ -6,7 +6,7 @@
 
 import 'package:expect/expect.dart';
 
-import "deferred_only_constant_lib.dart" deferred as lib;
+import "only_constant_lib.dart" deferred as lib;
 
 void main() {
   lib.loadLibrary().then((_) {
diff --git a/tests/language_2/deferred_optimized_test.dart b/tests/language_2/deferred/optimized_test.dart
similarity index 92%
rename from tests/language_2/deferred_optimized_test.dart
rename to tests/language_2/deferred/optimized_test.dart
index 8755e7f886a..7fd0a99babc 100644
--- a/tests/language_2/deferred_optimized_test.dart
+++ b/tests/language_2/deferred/optimized_test.dart
@@ -4,7 +4,7 @@
 // VMOptions=--optimization-counter-threshold=10 --compiler-passes=-Inlining
 
 // Declares foo that returns 42.
-import "deferred_constraints_lib2.dart" deferred as lib;
+import "constraints_lib2.dart" deferred as lib;
 
 import 'package:expect/expect.dart';
 
diff --git a/tests/language_2/deferred_prefix_constraints_lib.dart b/tests/language_2/deferred/prefix_constraints_lib.dart
similarity index 100%
rename from tests/language_2/deferred_prefix_constraints_lib.dart
rename to tests/language_2/deferred/prefix_constraints_lib.dart
diff --git a/tests/language_2/deferred_prefix_constraints_lib2.dart b/tests/language_2/deferred/prefix_constraints_lib2.dart
similarity index 100%
rename from tests/language_2/deferred_prefix_constraints_lib2.dart
rename to tests/language_2/deferred/prefix_constraints_lib2.dart
diff --git a/tests/language_2/deferred_redirecting_factory_lib1.dart b/tests/language_2/deferred/redirecting_factory_lib1.dart
similarity index 74%
rename from tests/language_2/deferred_redirecting_factory_lib1.dart
rename to tests/language_2/deferred/redirecting_factory_lib1.dart
index 170c5165790..1e1a7a1d3f1 100644
--- a/tests/language_2/deferred_redirecting_factory_lib1.dart
+++ b/tests/language_2/deferred/redirecting_factory_lib1.dart
@@ -4,8 +4,8 @@
 
 library lib1;
 
-import "deferred_redirecting_factory_lib2.dart" deferred as lib2;
-import "deferred_redirecting_factory_test.dart" as main;
+import "redirecting_factory_lib2.dart" deferred as lib2;
+import "redirecting_factory_test.dart" as main;
 
 loadLib2() {
   return lib2.loadLibrary();
diff --git a/tests/language_2/deferred_redirecting_factory_lib2.dart b/tests/language_2/deferred/redirecting_factory_lib2.dart
similarity index 83%
rename from tests/language_2/deferred_redirecting_factory_lib2.dart
rename to tests/language_2/deferred/redirecting_factory_lib2.dart
index ec33ce46131..a72be648aa2 100644
--- a/tests/language_2/deferred_redirecting_factory_lib2.dart
+++ b/tests/language_2/deferred/redirecting_factory_lib2.dart
@@ -4,7 +4,7 @@
 
 library lib2;
 
-import "deferred_redirecting_factory_lib1.dart" as lib1;
+import "redirecting_factory_lib1.dart" as lib1;
 
 class C extends lib1.C {
   String get foo => "lib2";
diff --git a/tests/language_2/deferred_redirecting_factory_test.dart b/tests/language_2/deferred/redirecting_factory_test.dart
similarity index 93%
rename from tests/language_2/deferred_redirecting_factory_test.dart
rename to tests/language_2/deferred/redirecting_factory_test.dart
index 5431f5007cc..1ee76d32487 100644
--- a/tests/language_2/deferred_redirecting_factory_test.dart
+++ b/tests/language_2/deferred/redirecting_factory_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 library main;
 
-import "deferred_redirecting_factory_lib1.dart" deferred as lib1;
+import "redirecting_factory_lib1.dart" deferred as lib1;
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 
diff --git a/tests/language_2/deferred_regression_22995_lib.dart b/tests/language_2/deferred/regression_22995_lib.dart
similarity index 85%
rename from tests/language_2/deferred_regression_22995_lib.dart
rename to tests/language_2/deferred/regression_22995_lib.dart
index d4efaf666e7..b6e3aef5ae7 100644
--- a/tests/language_2/deferred_regression_22995_lib.dart
+++ b/tests/language_2/deferred/regression_22995_lib.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'deferred_regression_22995_test.dart';
+import 'regression_22995_test.dart';
 
 foofoo() {
   new A();
diff --git a/tests/language_2/deferred_regression_22995_test.dart b/tests/language_2/deferred/regression_22995_test.dart
similarity index 91%
rename from tests/language_2/deferred_regression_22995_test.dart
rename to tests/language_2/deferred/regression_22995_test.dart
index f05b6fec407..fdd36c16ae1 100644
--- a/tests/language_2/deferred_regression_22995_test.dart
+++ b/tests/language_2/deferred/regression_22995_test.dart
@@ -6,7 +6,7 @@
 
 import "package:expect/expect.dart";
 
-import 'deferred_regression_22995_lib.dart' deferred as lib;
+import 'regression_22995_lib.dart' deferred as lib;
 
 class A {}
 
diff --git a/tests/language_2/deferred_regression_28678_lib.dart b/tests/language_2/deferred/regression_28678_lib.dart
similarity index 100%
rename from tests/language_2/deferred_regression_28678_lib.dart
rename to tests/language_2/deferred/regression_28678_lib.dart
diff --git a/tests/language_2/deferred_regression_28678_test.dart b/tests/language_2/deferred/regression_28678_test.dart
similarity index 91%
rename from tests/language_2/deferred_regression_28678_test.dart
rename to tests/language_2/deferred/regression_28678_test.dart
index 5051e729ead..16a95f92053 100644
--- a/tests/language_2/deferred_regression_28678_test.dart
+++ b/tests/language_2/deferred/regression_28678_test.dart
@@ -6,7 +6,7 @@
 
 import 'dart:async';
 import "package:expect/expect.dart";
-import 'deferred_regression_28678_lib.dart' deferred as lib;
+import 'regression_28678_lib.dart' deferred as lib;
 
 class A {
   m() => "here";
diff --git a/tests/language_2/deferred_shadow_load_library_lib.dart b/tests/language_2/deferred/shadow_load_library_lib.dart
similarity index 100%
rename from tests/language_2/deferred_shadow_load_library_lib.dart
rename to tests/language_2/deferred/shadow_load_library_lib.dart
diff --git a/tests/language_2/deferred_shadow_load_library_test.dart b/tests/language_2/deferred/shadow_load_library_test.dart
similarity index 91%
rename from tests/language_2/deferred_shadow_load_library_test.dart
rename to tests/language_2/deferred/shadow_load_library_test.dart
index 7fd3f741bf4..2c096c91e8c 100644
--- a/tests/language_2/deferred_shadow_load_library_test.dart
+++ b/tests/language_2/deferred/shadow_load_library_test.dart
@@ -8,7 +8,7 @@ import 'package:async_helper/async_helper.dart';
 
 // This library contains a member loadLibrary.
 // Check that we shadow this member.
-import "deferred_shadow_load_library_lib.dart" deferred as lib;
+import "shadow_load_library_lib.dart" deferred as lib;
 
 void main() {
   var x = lib.loadLibrary();
diff --git a/tests/language_2/deferred_shared_and_unshared_classes_lib1.dart b/tests/language_2/deferred/shared_and_unshared_classes_lib1.dart
similarity index 81%
rename from tests/language_2/deferred_shared_and_unshared_classes_lib1.dart
rename to tests/language_2/deferred/shared_and_unshared_classes_lib1.dart
index 4799e708b0a..28d2ef36788 100644
--- a/tests/language_2/deferred_shared_and_unshared_classes_lib1.dart
+++ b/tests/language_2/deferred/shared_and_unshared_classes_lib1.dart
@@ -4,7 +4,7 @@
 
 library lib1;
 
-import "deferred_shared_and_unshared_classes_lib_shared.dart";
+import "shared_and_unshared_classes_lib_shared.dart";
 
 foo() {
   print(new C1());
diff --git a/tests/language_2/deferred_shared_and_unshared_classes_lib2.dart b/tests/language_2/deferred/shared_and_unshared_classes_lib2.dart
similarity index 81%
rename from tests/language_2/deferred_shared_and_unshared_classes_lib2.dart
rename to tests/language_2/deferred/shared_and_unshared_classes_lib2.dart
index fc57e7ea112..86fc90100be 100644
--- a/tests/language_2/deferred_shared_and_unshared_classes_lib2.dart
+++ b/tests/language_2/deferred/shared_and_unshared_classes_lib2.dart
@@ -4,7 +4,7 @@
 
 library lib2;
 
-import "deferred_shared_and_unshared_classes_lib_shared.dart";
+import "shared_and_unshared_classes_lib_shared.dart";
 
 foo() {
   print(new C2());
diff --git a/tests/language_2/deferred_shared_and_unshared_classes_lib_shared.dart b/tests/language_2/deferred/shared_and_unshared_classes_lib_shared.dart
similarity index 100%
rename from tests/language_2/deferred_shared_and_unshared_classes_lib_shared.dart
rename to tests/language_2/deferred/shared_and_unshared_classes_lib_shared.dart
diff --git a/tests/language_2/deferred_shared_and_unshared_classes_test.dart b/tests/language_2/deferred/shared_and_unshared_classes_test.dart
similarity index 78%
rename from tests/language_2/deferred_shared_and_unshared_classes_test.dart
rename to tests/language_2/deferred/shared_and_unshared_classes_test.dart
index 9fd47dc6151..a815c74f164 100644
--- a/tests/language_2/deferred_shared_and_unshared_classes_test.dart
+++ b/tests/language_2/deferred/shared_and_unshared_classes_test.dart
@@ -4,8 +4,8 @@
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "deferred_shared_and_unshared_classes_lib1.dart" deferred as lib1;
-import "deferred_shared_and_unshared_classes_lib2.dart" deferred as lib2;
+import "shared_and_unshared_classes_lib1.dart" deferred as lib1;
+import "shared_and_unshared_classes_lib2.dart" deferred as lib2;
 import "dart:async";
 
 void main() {
diff --git a/tests/language_2/deferred_static_seperate_lib1.dart b/tests/language_2/deferred/static_seperate_lib1.dart
similarity index 100%
rename from tests/language_2/deferred_static_seperate_lib1.dart
rename to tests/language_2/deferred/static_seperate_lib1.dart
diff --git a/tests/language_2/deferred_static_seperate_lib2.dart b/tests/language_2/deferred/static_seperate_lib2.dart
similarity index 92%
rename from tests/language_2/deferred_static_seperate_lib2.dart
rename to tests/language_2/deferred/static_seperate_lib2.dart
index db07dd7ff72..683b9a4cf55 100644
--- a/tests/language_2/deferred_static_seperate_lib2.dart
+++ b/tests/language_2/deferred/static_seperate_lib2.dart
@@ -5,7 +5,7 @@
 library lib2;
 
 import "package:expect/expect.dart";
-import "deferred_static_seperate_lib1.dart";
+import "static_seperate_lib1.dart";
 
 foo() {
   Expect.equals(1, C.foo());
diff --git a/tests/language_2/deferred_static_seperate_test.dart b/tests/language_2/deferred/static_seperate_test.dart
similarity index 89%
rename from tests/language_2/deferred_static_seperate_test.dart
rename to tests/language_2/deferred/static_seperate_test.dart
index 50899273463..c920eb8edc4 100644
--- a/tests/language_2/deferred_static_seperate_test.dart
+++ b/tests/language_2/deferred/static_seperate_test.dart
@@ -9,8 +9,8 @@
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "deferred_static_seperate_lib1.dart" deferred as lib1;
-import "deferred_static_seperate_lib2.dart" deferred as lib2;
+import "static_seperate_lib1.dart" deferred as lib1;
+import "static_seperate_lib2.dart" deferred as lib2;
 
 void main() {
   asyncStart();
diff --git a/tests/language_2/deferred_super_dependency_lib.dart b/tests/language_2/deferred/super_dependency_lib.dart
similarity index 100%
rename from tests/language_2/deferred_super_dependency_lib.dart
rename to tests/language_2/deferred/super_dependency_lib.dart
diff --git a/tests/language_2/deferred_super_dependency_runtime_test.dart b/tests/language_2/deferred/super_dependency_runtime_test.dart
similarity index 100%
rename from tests/language_2/deferred_super_dependency_runtime_test.dart
rename to tests/language_2/deferred/super_dependency_runtime_test.dart
diff --git a/tests/language_2/deferred_super_dependency_test.dart b/tests/language_2/deferred/super_dependency_test.dart
similarity index 90%
rename from tests/language_2/deferred_super_dependency_test.dart
rename to tests/language_2/deferred/super_dependency_test.dart
index 75527cbe190..f49380cea18 100644
--- a/tests/language_2/deferred_super_dependency_test.dart
+++ b/tests/language_2/deferred/super_dependency_test.dart
@@ -10,7 +10,7 @@ import "package:expect/expect.dart";
 //        ^^^
 // [analyzer] STATIC_TYPE_WARNING.UNDEFINED_SUPER_SETTER
 // [cfe] Superclass has no setter named 'foo'.
-import "deferred_super_dependency_lib.dart" deferred as lib;
+import "super_dependency_lib.dart" deferred as lib;
 
 main() async {
   await lib.loadLibrary();
diff --git a/tests/language_2/deferred_type_dependency_lib1.dart b/tests/language_2/deferred/type_dependency_lib1.dart
similarity index 90%
rename from tests/language_2/deferred_type_dependency_lib1.dart
rename to tests/language_2/deferred/type_dependency_lib1.dart
index a3c92c094ea..d9a36637ec7 100644
--- a/tests/language_2/deferred_type_dependency_lib1.dart
+++ b/tests/language_2/deferred/type_dependency_lib1.dart
@@ -4,7 +4,7 @@
 
 library lib1;
 
-import "deferred_type_dependency_lib3.dart";
+import "type_dependency_lib3.dart";
 
 bool fooIs(x) {
   return x is A;
diff --git a/tests/language_2/deferred_type_dependency_lib2.dart b/tests/language_2/deferred/type_dependency_lib2.dart
similarity index 82%
rename from tests/language_2/deferred_type_dependency_lib2.dart
rename to tests/language_2/deferred/type_dependency_lib2.dart
index 694d15f46fe..d20f4c0aaad 100644
--- a/tests/language_2/deferred_type_dependency_lib2.dart
+++ b/tests/language_2/deferred/type_dependency_lib2.dart
@@ -4,7 +4,7 @@
 
 library lib2;
 
-import "deferred_type_dependency_lib3.dart";
+import "type_dependency_lib3.dart";
 
 getInstance() {
   return new A();
diff --git a/tests/language_2/deferred_type_dependency_lib3.dart b/tests/language_2/deferred/type_dependency_lib3.dart
similarity index 100%
rename from tests/language_2/deferred_type_dependency_lib3.dart
rename to tests/language_2/deferred/type_dependency_lib3.dart
diff --git a/tests/language_2/deferred_type_dependency_test.dart b/tests/language_2/deferred/type_dependency_test.dart
similarity index 87%
rename from tests/language_2/deferred_type_dependency_test.dart
rename to tests/language_2/deferred/type_dependency_test.dart
index 5b2ea9cba0d..7d31d5fd769 100644
--- a/tests/language_2/deferred_type_dependency_test.dart
+++ b/tests/language_2/deferred/type_dependency_test.dart
@@ -5,8 +5,8 @@
 /// Checks that lib1.fooX's dependencies on [A] via is-checks, as-expressions
 /// and type-annotations(in checked-mode) is correctly tracked.
 
-import "deferred_type_dependency_lib1.dart" deferred as lib1;
-import "deferred_type_dependency_lib2.dart" deferred as lib2;
+import "type_dependency_lib1.dart" deferred as lib1;
+import "type_dependency_lib2.dart" deferred as lib2;
 import "package:expect/expect.dart";
 
 main() async {
diff --git a/tests/language_2/double_comparison_test.dart b/tests/language_2/double/comparison_test.dart
similarity index 100%
rename from tests/language_2/double_comparison_test.dart
rename to tests/language_2/double/comparison_test.dart
diff --git a/tests/language_2/double_identical_test.dart b/tests/language_2/double/identical_test.dart
similarity index 100%
rename from tests/language_2/double_identical_test.dart
rename to tests/language_2/double/identical_test.dart
diff --git a/tests/language_2/double_int_addition_test.dart b/tests/language_2/double/int_addition_test.dart
similarity index 100%
rename from tests/language_2/double_int_addition_test.dart
rename to tests/language_2/double/int_addition_test.dart
diff --git a/tests/language_2/double_int_to_string_test.dart b/tests/language_2/double/int_to_string_test.dart
similarity index 100%
rename from tests/language_2/double_int_to_string_test.dart
rename to tests/language_2/double/int_to_string_test.dart
diff --git a/tests/language_2/double_invalid_runtime_test.dart b/tests/language_2/double/invalid_runtime_test.dart
similarity index 100%
rename from tests/language_2/double_invalid_runtime_test.dart
rename to tests/language_2/double/invalid_runtime_test.dart
diff --git a/tests/language_2/double_invalid_test.dart b/tests/language_2/double/invalid_test.dart
similarity index 100%
rename from tests/language_2/double_invalid_test.dart
rename to tests/language_2/double/invalid_test.dart
diff --git a/tests/language_2/double_modulo_test.dart b/tests/language_2/double/modulo_test.dart
similarity index 100%
rename from tests/language_2/double_modulo_test.dart
rename to tests/language_2/double/modulo_test.dart
diff --git a/tests/language_2/double_nan_comparison_test.dart b/tests/language_2/double/nan_comparison_test.dart
similarity index 100%
rename from tests/language_2/double_nan_comparison_test.dart
rename to tests/language_2/double/nan_comparison_test.dart
diff --git a/tests/language_2/double_to_string_as_exponential2_runtime_test.dart b/tests/language_2/double/to_string_as_exponential2_runtime_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_exponential2_runtime_test.dart
rename to tests/language_2/double/to_string_as_exponential2_runtime_test.dart
diff --git a/tests/language_2/double_to_string_as_exponential2_test.dart b/tests/language_2/double/to_string_as_exponential2_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_exponential2_test.dart
rename to tests/language_2/double/to_string_as_exponential2_test.dart
diff --git a/tests/language_2/double_to_string_as_exponential3_test.dart b/tests/language_2/double/to_string_as_exponential3_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_exponential3_test.dart
rename to tests/language_2/double/to_string_as_exponential3_test.dart
diff --git a/tests/language_2/double_to_string_as_exponential_test.dart b/tests/language_2/double/to_string_as_exponential_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_exponential_test.dart
rename to tests/language_2/double/to_string_as_exponential_test.dart
diff --git a/tests/language_2/double_to_string_as_fixed2_runtime_test.dart b/tests/language_2/double/to_string_as_fixed2_runtime_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_fixed2_runtime_test.dart
rename to tests/language_2/double/to_string_as_fixed2_runtime_test.dart
diff --git a/tests/language_2/double_to_string_as_fixed2_test.dart b/tests/language_2/double/to_string_as_fixed2_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_fixed2_test.dart
rename to tests/language_2/double/to_string_as_fixed2_test.dart
diff --git a/tests/language_2/double_to_string_as_fixed_test.dart b/tests/language_2/double/to_string_as_fixed_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_fixed_test.dart
rename to tests/language_2/double/to_string_as_fixed_test.dart
diff --git a/tests/language_2/double_to_string_as_precision2_runtime_test.dart b/tests/language_2/double/to_string_as_precision2_runtime_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_precision2_runtime_test.dart
rename to tests/language_2/double/to_string_as_precision2_runtime_test.dart
diff --git a/tests/language_2/double_to_string_as_precision2_test.dart b/tests/language_2/double/to_string_as_precision2_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_precision2_test.dart
rename to tests/language_2/double/to_string_as_precision2_test.dart
diff --git a/tests/language_2/double_to_string_as_precision3_test.dart b/tests/language_2/double/to_string_as_precision3_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_precision3_test.dart
rename to tests/language_2/double/to_string_as_precision3_test.dart
diff --git a/tests/language_2/double_to_string_as_precision_test.dart b/tests/language_2/double/to_string_as_precision_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_as_precision_test.dart
rename to tests/language_2/double/to_string_as_precision_test.dart
diff --git a/tests/language_2/double_to_string_test.dart b/tests/language_2/double/to_string_test.dart
similarity index 100%
rename from tests/language_2/double_to_string_test.dart
rename to tests/language_2/double/to_string_test.dart
diff --git a/tests/language_2/dynamic_call_test.dart b/tests/language_2/dynamic/call_test.dart
similarity index 100%
rename from tests/language_2/dynamic_call_test.dart
rename to tests/language_2/dynamic/call_test.dart
diff --git a/tests/language_2/dynamic2_runtime_test.dart b/tests/language_2/dynamic/dynamic2_runtime_test.dart
similarity index 100%
rename from tests/language_2/dynamic2_runtime_test.dart
rename to tests/language_2/dynamic/dynamic2_runtime_test.dart
diff --git a/tests/language_2/dynamic2_test.dart b/tests/language_2/dynamic/dynamic2_test.dart
similarity index 100%
rename from tests/language_2/dynamic2_test.dart
rename to tests/language_2/dynamic/dynamic2_test.dart
diff --git a/tests/language_2/dynamic_test.dart b/tests/language_2/dynamic/dynamic_test.dart
similarity index 100%
rename from tests/language_2/dynamic_test.dart
rename to tests/language_2/dynamic/dynamic_test.dart
diff --git a/tests/language_2/dynamic_field_runtime_test.dart b/tests/language_2/dynamic/field_runtime_test.dart
similarity index 100%
rename from tests/language_2/dynamic_field_runtime_test.dart
rename to tests/language_2/dynamic/field_runtime_test.dart
diff --git a/tests/language_2/dynamic_field_test.dart b/tests/language_2/dynamic/field_test.dart
similarity index 100%
rename from tests/language_2/dynamic_field_test.dart
rename to tests/language_2/dynamic/field_test.dart
diff --git a/tests/language_2/hashcode_dynamic_test.dart b/tests/language_2/dynamic/hash_code_test.dart
similarity index 100%
rename from tests/language_2/hashcode_dynamic_test.dart
rename to tests/language_2/dynamic/hash_code_test.dart
diff --git a/tests/language_2/dynamic_invoke_test.dart b/tests/language_2/dynamic/invoke_test.dart
similarity index 100%
rename from tests/language_2/dynamic_invoke_test.dart
rename to tests/language_2/dynamic/invoke_test.dart
diff --git a/tests/language_2/dynamic_prefix_core_test.dart b/tests/language_2/dynamic/prefix_core_test.dart
similarity index 100%
rename from tests/language_2/dynamic_prefix_core_test.dart
rename to tests/language_2/dynamic/prefix_core_test.dart
diff --git a/tests/language_2/dynamic_set_test.dart b/tests/language_2/dynamic/set_test.dart
similarity index 100%
rename from tests/language_2/dynamic_set_test.dart
rename to tests/language_2/dynamic/set_test.dart
diff --git a/tests/language_2/dynamic_type_literal_test.dart b/tests/language_2/dynamic/type_literal_test.dart
similarity index 100%
rename from tests/language_2/dynamic_type_literal_test.dart
rename to tests/language_2/dynamic/type_literal_test.dart
diff --git a/tests/language_2/enum_duplicate_lib.dart b/tests/language_2/enum/duplicate_lib.dart
similarity index 100%
rename from tests/language_2/enum_duplicate_lib.dart
rename to tests/language_2/enum/duplicate_lib.dart
diff --git a/tests/language_2/enum_duplicate_test.dart b/tests/language_2/enum/duplicate_test.dart
similarity index 86%
rename from tests/language_2/enum_duplicate_test.dart
rename to tests/language_2/enum/duplicate_test.dart
index 256d98cee57..79046521fdc 100644
--- a/tests/language_2/enum_duplicate_test.dart
+++ b/tests/language_2/enum/duplicate_test.dart
@@ -8,8 +8,8 @@ library enum_duplicate_test;
 
 import 'package:expect/expect.dart';
 
-import 'enum_duplicate_lib.dart' as lib; //# 01: ok
-import 'enum_duplicate_lib.dart' as lib; //# 02: ok
+import 'duplicate_lib.dart' as lib; //# 01: ok
+import 'duplicate_lib.dart' as lib; //# 02: ok
 
 enum Enum1 {
   A,
diff --git a/tests/language_2/enum_test.dart b/tests/language_2/enum/enum_test.dart
similarity index 100%
rename from tests/language_2/enum_test.dart
rename to tests/language_2/enum/enum_test.dart
diff --git a/tests/language_2/enum_index_test.dart b/tests/language_2/enum/index_test.dart
similarity index 100%
rename from tests/language_2/enum_index_test.dart
rename to tests/language_2/enum/index_test.dart
diff --git a/tests/language_2/enum_initialization_near_stack_overflow_test.dart b/tests/language_2/enum/initialization_near_stack_overflow_test.dart
similarity index 100%
rename from tests/language_2/enum_initialization_near_stack_overflow_test.dart
rename to tests/language_2/enum/initialization_near_stack_overflow_test.dart
diff --git a/tests/language_2/enum_is_keyword_runtime_test.dart b/tests/language_2/enum/is_keyword_runtime_test.dart
similarity index 100%
rename from tests/language_2/enum_is_keyword_runtime_test.dart
rename to tests/language_2/enum/is_keyword_runtime_test.dart
diff --git a/tests/language_2/enum_is_keyword_test.dart b/tests/language_2/enum/is_keyword_test.dart
similarity index 100%
rename from tests/language_2/enum_is_keyword_test.dart
rename to tests/language_2/enum/is_keyword_test.dart
diff --git a/tests/language_2/enum_private_lib.dart b/tests/language_2/enum/private_lib.dart
similarity index 100%
rename from tests/language_2/enum_private_lib.dart
rename to tests/language_2/enum/private_lib.dart
diff --git a/tests/language_2/enum_private_runtime_1_test.dart b/tests/language_2/enum/private_runtime_1_test.dart
similarity index 94%
rename from tests/language_2/enum_private_runtime_1_test.dart
rename to tests/language_2/enum/private_runtime_1_test.dart
index 62089400dce..34af1267522 100644
--- a/tests/language_2/enum_private_runtime_1_test.dart
+++ b/tests/language_2/enum/private_runtime_1_test.dart
@@ -11,7 +11,7 @@ library enum_private_test;
 
 import 'package:expect/expect.dart';
 
-import 'enum_private_lib.dart';
+import 'private_lib.dart';
 
 enum Enum1 {
   _A,
diff --git a/tests/language_2/enum_private_runtime_test.dart b/tests/language_2/enum/private_runtime_test.dart
similarity index 94%
rename from tests/language_2/enum_private_runtime_test.dart
rename to tests/language_2/enum/private_runtime_test.dart
index 544217153db..adc8d7a3743 100644
--- a/tests/language_2/enum_private_runtime_test.dart
+++ b/tests/language_2/enum/private_runtime_test.dart
@@ -11,7 +11,7 @@ library enum_private_test;
 
 import 'package:expect/expect.dart';
 
-import 'enum_private_lib.dart';
+import 'private_lib.dart';
 
 enum Enum1 {
   _A,
diff --git a/tests/language_2/enum_private_test.dart b/tests/language_2/enum/private_test.dart
similarity index 95%
rename from tests/language_2/enum_private_test.dart
rename to tests/language_2/enum/private_test.dart
index d2661cfc529..cf2376d478a 100644
--- a/tests/language_2/enum_private_test.dart
+++ b/tests/language_2/enum/private_test.dart
@@ -8,7 +8,7 @@ library enum_private_test;
 
 import 'package:expect/expect.dart';
 
-import 'enum_private_lib.dart';
+import 'private_lib.dart';
 
 enum Enum1 {
   _A,
diff --git a/tests/language_2/enum_syntax_test.dart b/tests/language_2/enum/syntax_test.dart
similarity index 100%
rename from tests/language_2/enum_syntax_test.dart
rename to tests/language_2/enum/syntax_test.dart
diff --git a/tests/language_2/enum_value_name_test.dart b/tests/language_2/enum/value_name_test.dart
similarity index 100%
rename from tests/language_2/enum_value_name_test.dart
rename to tests/language_2/enum/value_name_test.dart
diff --git a/tests/language_2/catch_liveness_test.dart b/tests/language_2/exception/catch_liveness_test.dart
similarity index 100%
rename from tests/language_2/catch_liveness_test.dart
rename to tests/language_2/exception/catch_liveness_test.dart
diff --git a/tests/language_2/code_after_try_is_executed_test.dart b/tests/language_2/exception/code_after_try_is_executed_test.dart
similarity index 100%
rename from tests/language_2/code_after_try_is_executed_test.dart
rename to tests/language_2/exception/code_after_try_is_executed_test.dart
diff --git a/tests/language_2/exception_test.dart b/tests/language_2/exception/exception_test.dart
similarity index 100%
rename from tests/language_2/exception_test.dart
rename to tests/language_2/exception/exception_test.dart
diff --git a/tests/language_2/execute_finally10_test.dart b/tests/language_2/exception/finally10_test.dart
similarity index 100%
rename from tests/language_2/execute_finally10_test.dart
rename to tests/language_2/exception/finally10_test.dart
diff --git a/tests/language_2/execute_finally11_test.dart b/tests/language_2/exception/finally11_test.dart
similarity index 100%
rename from tests/language_2/execute_finally11_test.dart
rename to tests/language_2/exception/finally11_test.dart
diff --git a/tests/language_2/execute_finally12_test.dart b/tests/language_2/exception/finally12_test.dart
similarity index 100%
rename from tests/language_2/execute_finally12_test.dart
rename to tests/language_2/exception/finally12_test.dart
diff --git a/tests/language_2/execute_finally1_test.dart b/tests/language_2/exception/finally1_test.dart
similarity index 100%
rename from tests/language_2/execute_finally1_test.dart
rename to tests/language_2/exception/finally1_test.dart
diff --git a/tests/language_2/execute_finally2_test.dart b/tests/language_2/exception/finally2_test.dart
similarity index 100%
rename from tests/language_2/execute_finally2_test.dart
rename to tests/language_2/exception/finally2_test.dart
diff --git a/tests/language_2/execute_finally3_test.dart b/tests/language_2/exception/finally3_test.dart
similarity index 100%
rename from tests/language_2/execute_finally3_test.dart
rename to tests/language_2/exception/finally3_test.dart
diff --git a/tests/language_2/execute_finally4_test.dart b/tests/language_2/exception/finally4_test.dart
similarity index 100%
rename from tests/language_2/execute_finally4_test.dart
rename to tests/language_2/exception/finally4_test.dart
diff --git a/tests/language_2/execute_finally5_test.dart b/tests/language_2/exception/finally5_test.dart
similarity index 100%
rename from tests/language_2/execute_finally5_test.dart
rename to tests/language_2/exception/finally5_test.dart
diff --git a/tests/language_2/execute_finally6_test.dart b/tests/language_2/exception/finally6_test.dart
similarity index 100%
rename from tests/language_2/execute_finally6_test.dart
rename to tests/language_2/exception/finally6_test.dart
diff --git a/tests/language_2/execute_finally7_test.dart b/tests/language_2/exception/finally7_test.dart
similarity index 100%
rename from tests/language_2/execute_finally7_test.dart
rename to tests/language_2/exception/finally7_test.dart
diff --git a/tests/language_2/execute_finally8_test.dart b/tests/language_2/exception/finally8_test.dart
similarity index 100%
rename from tests/language_2/execute_finally8_test.dart
rename to tests/language_2/exception/finally8_test.dart
diff --git a/tests/language_2/execute_finally9_test.dart b/tests/language_2/exception/finally9_test.dart
similarity index 100%
rename from tests/language_2/execute_finally9_test.dart
rename to tests/language_2/exception/finally9_test.dart
diff --git a/tests/language_2/finally_test.dart b/tests/language_2/exception/finally_test.dart
similarity index 100%
rename from tests/language_2/finally_test.dart
rename to tests/language_2/exception/finally_test.dart
diff --git a/tests/language_2/exception_identity_test.dart b/tests/language_2/exception/identity_test.dart
similarity index 100%
rename from tests/language_2/exception_identity_test.dart
rename to tests/language_2/exception/identity_test.dart
diff --git a/tests/language_2/exception_in_increment_test.dart b/tests/language_2/exception/in_increment_test.dart
similarity index 100%
rename from tests/language_2/exception_in_increment_test.dart
rename to tests/language_2/exception/in_increment_test.dart
diff --git a/tests/language_2/on_catch_malformed_type_test.dart b/tests/language_2/exception/on_catch_malformed_type_test.dart
similarity index 100%
rename from tests/language_2/on_catch_malformed_type_test.dart
rename to tests/language_2/exception/on_catch_malformed_type_test.dart
diff --git a/tests/language_2/rethrow_test.dart b/tests/language_2/exception/rethrow_test.dart
similarity index 100%
rename from tests/language_2/rethrow_test.dart
rename to tests/language_2/exception/rethrow_test.dart
diff --git a/tests/language_2/throw1_test.dart b/tests/language_2/exception/throw1_test.dart
similarity index 100%
rename from tests/language_2/throw1_test.dart
rename to tests/language_2/exception/throw1_test.dart
diff --git a/tests/language_2/throw2_test.dart b/tests/language_2/exception/throw2_test.dart
similarity index 100%
rename from tests/language_2/throw2_test.dart
rename to tests/language_2/exception/throw2_test.dart
diff --git a/tests/language_2/throw3_test.dart b/tests/language_2/exception/throw3_test.dart
similarity index 100%
rename from tests/language_2/throw3_test.dart
rename to tests/language_2/exception/throw3_test.dart
diff --git a/tests/language_2/throw4_test.dart b/tests/language_2/exception/throw4_test.dart
similarity index 100%
rename from tests/language_2/throw4_test.dart
rename to tests/language_2/exception/throw4_test.dart
diff --git a/tests/language_2/throw5_test.dart b/tests/language_2/exception/throw5_test.dart
similarity index 100%
rename from tests/language_2/throw5_test.dart
rename to tests/language_2/exception/throw5_test.dart
diff --git a/tests/language_2/throw6_test.dart b/tests/language_2/exception/throw6_test.dart
similarity index 100%
rename from tests/language_2/throw6_test.dart
rename to tests/language_2/exception/throw6_test.dart
diff --git a/tests/language_2/throw8_test.dart b/tests/language_2/exception/throw8_test.dart
similarity index 100%
rename from tests/language_2/throw8_test.dart
rename to tests/language_2/exception/throw8_test.dart
diff --git a/tests/language_2/throw_expr_test.dart b/tests/language_2/exception/throw_expr_test.dart
similarity index 100%
rename from tests/language_2/throw_expr_test.dart
rename to tests/language_2/exception/throw_expr_test.dart
diff --git a/tests/language_2/throw_test.dart b/tests/language_2/exception/throw_test.dart
similarity index 100%
rename from tests/language_2/throw_test.dart
rename to tests/language_2/exception/throw_test.dart
diff --git a/tests/language_2/try_catch2_test.dart b/tests/language_2/exception/try_catch2_test.dart
similarity index 100%
rename from tests/language_2/try_catch2_test.dart
rename to tests/language_2/exception/try_catch2_test.dart
diff --git a/tests/language_2/try_catch3_test.dart b/tests/language_2/exception/try_catch3_test.dart
similarity index 100%
rename from tests/language_2/try_catch3_test.dart
rename to tests/language_2/exception/try_catch3_test.dart
diff --git a/tests/language_2/try_catch4_test.dart b/tests/language_2/exception/try_catch4_test.dart
similarity index 100%
rename from tests/language_2/try_catch4_test.dart
rename to tests/language_2/exception/try_catch4_test.dart
diff --git a/tests/language_2/try_catch5_test.dart b/tests/language_2/exception/try_catch5_test.dart
similarity index 100%
rename from tests/language_2/try_catch5_test.dart
rename to tests/language_2/exception/try_catch5_test.dart
diff --git a/tests/language_2/try_catch_on_syntax_test.dart b/tests/language_2/exception/try_catch_on_syntax_test.dart
similarity index 100%
rename from tests/language_2/try_catch_on_syntax_test.dart
rename to tests/language_2/exception/try_catch_on_syntax_test.dart
diff --git a/tests/language_2/try_catch_optimized1_test.dart b/tests/language_2/exception/try_catch_optimized1_test.dart
similarity index 100%
rename from tests/language_2/try_catch_optimized1_test.dart
rename to tests/language_2/exception/try_catch_optimized1_test.dart
diff --git a/tests/language_2/try_catch_optimized2_test.dart b/tests/language_2/exception/try_catch_optimized2_test.dart
similarity index 100%
rename from tests/language_2/try_catch_optimized2_test.dart
rename to tests/language_2/exception/try_catch_optimized2_test.dart
diff --git a/tests/language_2/try_catch_optimized3_test.dart b/tests/language_2/exception/try_catch_optimized3_test.dart
similarity index 100%
rename from tests/language_2/try_catch_optimized3_test.dart
rename to tests/language_2/exception/try_catch_optimized3_test.dart
diff --git a/tests/language_2/try_catch_optimized4_test.dart b/tests/language_2/exception/try_catch_optimized4_test.dart
similarity index 100%
rename from tests/language_2/try_catch_optimized4_test.dart
rename to tests/language_2/exception/try_catch_optimized4_test.dart
diff --git a/tests/language_2/try_catch_optimized5_test.dart b/tests/language_2/exception/try_catch_optimized5_test.dart
similarity index 100%
rename from tests/language_2/try_catch_optimized5_test.dart
rename to tests/language_2/exception/try_catch_optimized5_test.dart
diff --git a/tests/language_2/try_catch_osr_test.dart b/tests/language_2/exception/try_catch_osr_test.dart
similarity index 100%
rename from tests/language_2/try_catch_osr_test.dart
rename to tests/language_2/exception/try_catch_osr_test.dart
diff --git a/tests/language_2/try_catch_regress_27483_test.dart b/tests/language_2/exception/try_catch_regress_27483_test.dart
similarity index 100%
rename from tests/language_2/try_catch_regress_27483_test.dart
rename to tests/language_2/exception/try_catch_regress_27483_test.dart
diff --git a/tests/language_2/try_catch_runtime_test.dart b/tests/language_2/exception/try_catch_runtime_test.dart
similarity index 100%
rename from tests/language_2/try_catch_runtime_test.dart
rename to tests/language_2/exception/try_catch_runtime_test.dart
diff --git a/tests/language_2/try_catch_syntax_test.dart b/tests/language_2/exception/try_catch_syntax_test.dart
similarity index 100%
rename from tests/language_2/try_catch_syntax_test.dart
rename to tests/language_2/exception/try_catch_syntax_test.dart
diff --git a/tests/language_2/try_catch_test.dart b/tests/language_2/exception/try_catch_test.dart
similarity index 100%
rename from tests/language_2/try_catch_test.dart
rename to tests/language_2/exception/try_catch_test.dart
diff --git a/tests/language_2/try_finally_regress_25333_test.dart b/tests/language_2/exception/try_finally_regress_25333_test.dart
similarity index 100%
rename from tests/language_2/try_finally_regress_25333_test.dart
rename to tests/language_2/exception/try_finally_regress_25333_test.dart
diff --git a/tests/language_2/try_finally_regress_25654_test.dart b/tests/language_2/exception/try_finally_regress_25654_test.dart
similarity index 100%
rename from tests/language_2/try_finally_regress_25654_test.dart
rename to tests/language_2/exception/try_finally_regress_25654_test.dart
diff --git a/tests/language_2/export_ambiguous_main_a.dart b/tests/language_2/export/ambiguous_main_a.dart
similarity index 100%
rename from tests/language_2/export_ambiguous_main_a.dart
rename to tests/language_2/export/ambiguous_main_a.dart
diff --git a/tests/language_2/export_ambiguous_main_b.dart b/tests/language_2/export/ambiguous_main_b.dart
similarity index 100%
rename from tests/language_2/export_ambiguous_main_b.dart
rename to tests/language_2/export/ambiguous_main_b.dart
diff --git a/tests/language_2/export_ambiguous_main_test.dart b/tests/language_2/export/ambiguous_main_test.dart
similarity index 66%
rename from tests/language_2/export_ambiguous_main_test.dart
rename to tests/language_2/export/ambiguous_main_test.dart
index 51fd4aa07f4..b2a8a24c064 100644
--- a/tests/language_2/export_ambiguous_main_test.dart
+++ b/tests/language_2/export/ambiguous_main_test.dart
@@ -2,5 +2,5 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export 'export_ambiguous_main_a.dart';
-export 'export_ambiguous_main_b.dart'; /*@compile-error=unspecified*/
+export 'ambiguous_main_a.dart';
+export 'ambiguous_main_b.dart'; /*@compile-error=unspecified*/
diff --git a/tests/language_2/export_cyclic_helper1.dart b/tests/language_2/export/cyclic_helper1.dart
similarity index 79%
rename from tests/language_2/export_cyclic_helper1.dart
rename to tests/language_2/export/cyclic_helper1.dart
index 4e8a68b15cb..af3225b7d79 100644
--- a/tests/language_2/export_cyclic_helper1.dart
+++ b/tests/language_2/export/cyclic_helper1.dart
@@ -4,8 +4,8 @@
 
 library export_cyclic_helper1;
 
-import 'export_cyclic_helper2.dart';
-export 'export_cyclic_helper2.dart';
+import 'cyclic_helper2.dart';
+export 'cyclic_helper2.dart';
 
 class B {
   A a;
diff --git a/tests/language_2/export_cyclic_helper2.dart b/tests/language_2/export/cyclic_helper2.dart
similarity index 67%
rename from tests/language_2/export_cyclic_helper2.dart
rename to tests/language_2/export/cyclic_helper2.dart
index c602467089b..2ad239c8f9f 100644
--- a/tests/language_2/export_cyclic_helper2.dart
+++ b/tests/language_2/export/cyclic_helper2.dart
@@ -4,10 +4,10 @@
 
 library export_cyclic_helper2;
 
-import 'export_cyclic_test.dart';
-import 'export_cyclic_helper3.dart';
-export 'export_cyclic_test.dart';
-export 'export_cyclic_helper3.dart';
+import 'cyclic_test.dart';
+import 'cyclic_helper3.dart';
+export 'cyclic_test.dart';
+export 'cyclic_helper3.dart';
 
 class C {
   A a;
diff --git a/tests/language_2/export_cyclic_helper3.dart b/tests/language_2/export/cyclic_helper3.dart
similarity index 100%
rename from tests/language_2/export_cyclic_helper3.dart
rename to tests/language_2/export/cyclic_helper3.dart
diff --git a/tests/language_2/export_cyclic_test.dart b/tests/language_2/export/cyclic_test.dart
similarity index 90%
rename from tests/language_2/export_cyclic_test.dart
rename to tests/language_2/export/cyclic_test.dart
index a971fc06097..d854a398137 100644
--- a/tests/language_2/export_cyclic_test.dart
+++ b/tests/language_2/export/cyclic_test.dart
@@ -13,8 +13,8 @@
 
 library export_cyclic_test;
 
-import 'export_cyclic_helper1.dart';
-export 'export_cyclic_helper1.dart';
+import 'cyclic_helper1.dart';
+export 'cyclic_helper1.dart';
 
 class A {}
 
diff --git a/tests/language_2/export_double_same_main_test.dart b/tests/language_2/export/double_same_main_test.dart
similarity index 85%
rename from tests/language_2/export_double_same_main_test.dart
rename to tests/language_2/export/double_same_main_test.dart
index 68ad6003113..8923855e738 100644
--- a/tests/language_2/export_double_same_main_test.dart
+++ b/tests/language_2/export/double_same_main_test.dart
@@ -3,4 +3,4 @@
 // BSD-style license that can be found in the LICENSE file.
 
 export 'top_level_entry_test.dart';
-export 'export_main_test.dart' show main;
+export 'main_test.dart' show main;
diff --git a/tests/language_2/duplicate_export_collision_test.dart b/tests/language_2/export/duplicate_collision_test.dart
similarity index 100%
rename from tests/language_2/duplicate_export_collision_test.dart
rename to tests/language_2/export/duplicate_collision_test.dart
diff --git a/tests/language_2/duplicate_export_test.dart b/tests/language_2/export/duplicate_export_test.dart
similarity index 83%
rename from tests/language_2/duplicate_export_test.dart
rename to tests/language_2/export/duplicate_export_test.dart
index de4512effe0..75f8a8234ed 100644
--- a/tests/language_2/duplicate_export_test.dart
+++ b/tests/language_2/export/duplicate_export_test.dart
@@ -8,6 +8,6 @@
 library duplicate_export_test;
 
 export 'duplicate_import_liba.dart';
-export 'duplicate_export_liba.dart'; // reexports 'duplicate_import_liba.dart'.
+export 'duplicate_liba.dart'; // reexports 'duplicate_import_liba.dart'.
 
 void main() {}
diff --git a/tests/language_2/duplicate_import_liba.dart b/tests/language_2/export/duplicate_import_liba.dart
similarity index 100%
rename from tests/language_2/duplicate_import_liba.dart
rename to tests/language_2/export/duplicate_import_liba.dart
diff --git a/tests/language_2/duplicate_import_libb.dart b/tests/language_2/export/duplicate_import_libb.dart
similarity index 100%
rename from tests/language_2/duplicate_import_libb.dart
rename to tests/language_2/export/duplicate_import_libb.dart
diff --git a/tests/language_2/duplicate_import_libc.dart b/tests/language_2/export/duplicate_import_libc.dart
similarity index 100%
rename from tests/language_2/duplicate_import_libc.dart
rename to tests/language_2/export/duplicate_import_libc.dart
diff --git a/tests/language_2/duplicate_import_libd.dart b/tests/language_2/export/duplicate_import_libd.dart
similarity index 91%
rename from tests/language_2/duplicate_import_libd.dart
rename to tests/language_2/export/duplicate_import_libd.dart
index ccec81e0ff6..14f1ff413fb 100644
--- a/tests/language_2/duplicate_import_libd.dart
+++ b/tests/language_2/export/duplicate_import_libd.dart
@@ -8,6 +8,6 @@ import 'duplicate_import_liba.dart';
 import 'duplicate_import_libb.dart';
 import 'duplicate_import_libc.dart';
 
-export 'duplicate_import_liba.dart';
+export '../duplicate_import_liba.dart';
 export 'duplicate_import_libb.dart';
 export 'duplicate_import_libc.dart';
diff --git a/tests/language_2/duplicate_export_liba.dart b/tests/language_2/export/duplicate_liba.dart
similarity index 100%
rename from tests/language_2/duplicate_export_liba.dart
rename to tests/language_2/export/duplicate_liba.dart
diff --git a/tests/language_2/export_test.dart b/tests/language_2/export/export_test.dart
similarity index 85%
rename from tests/language_2/export_test.dart
rename to tests/language_2/export/export_test.dart
index 790ff94fffa..e1faa616b7f 100644
--- a/tests/language_2/export_test.dart
+++ b/tests/language_2/export/export_test.dart
@@ -6,8 +6,8 @@
 
 library export_test;
 
-import 'export_helper1.dart';
-import 'export_helper3.dart' as lib;
+import 'helper1.dart';
+import 'helper3.dart' as lib;
 
 void main() {
   print(new Exported());
diff --git a/tests/language_2/export_helper1.dart b/tests/language_2/export/helper1.dart
similarity index 82%
rename from tests/language_2/export_helper1.dart
rename to tests/language_2/export/helper1.dart
index 4f42ae8f31f..5b670f45031 100644
--- a/tests/language_2/export_helper1.dart
+++ b/tests/language_2/export/helper1.dart
@@ -4,7 +4,7 @@
 
 library export_helper1;
 
-import 'export_helper2.dart';
-export 'export_helper2.dart';
+import 'helper2.dart';
+export 'helper2.dart';
 
 class Exported extends ReExported {}
diff --git a/tests/language_2/export_helper2.dart b/tests/language_2/export/helper2.dart
similarity index 100%
rename from tests/language_2/export_helper2.dart
rename to tests/language_2/export/helper2.dart
diff --git a/tests/language_2/export_helper3.dart b/tests/language_2/export/helper3.dart
similarity index 82%
rename from tests/language_2/export_helper3.dart
rename to tests/language_2/export/helper3.dart
index b10f0b3a8e9..3b3bed9b847 100644
--- a/tests/language_2/export_helper3.dart
+++ b/tests/language_2/export/helper3.dart
@@ -4,7 +4,7 @@
 
 library export_helper3;
 
-import 'export_helper4.dart';
-export 'export_helper4.dart';
+import 'helper4.dart';
+export 'helper4.dart';
 
 class Exported extends ReExported {}
diff --git a/tests/language_2/export_helper4.dart b/tests/language_2/export/helper4.dart
similarity index 100%
rename from tests/language_2/export_helper4.dart
rename to tests/language_2/export/helper4.dart
diff --git a/tests/language_2/local_export_a.dart b/tests/language_2/export/local_a.dart
similarity index 88%
rename from tests/language_2/local_export_a.dart
rename to tests/language_2/export/local_a.dart
index e9c8819b0f9..dd6d0391afd 100644
--- a/tests/language_2/local_export_a.dart
+++ b/tests/language_2/export/local_a.dart
@@ -4,7 +4,7 @@
 
 library local_export_a;
 
-export 'local_export_a_export.dart';
+export 'local_a_export.dart';
 
 class A {
   method() => 42;
diff --git a/tests/language_2/local_export_a_export.dart b/tests/language_2/export/local_a_export.dart
similarity index 100%
rename from tests/language_2/local_export_a_export.dart
rename to tests/language_2/export/local_a_export.dart
diff --git a/tests/language_2/local_export_test.dart b/tests/language_2/export/local_export_test.dart
similarity index 91%
rename from tests/language_2/local_export_test.dart
rename to tests/language_2/export/local_export_test.dart
index e79472c6243..2ed46594128 100644
--- a/tests/language_2/local_export_test.dart
+++ b/tests/language_2/export/local_export_test.dart
@@ -5,7 +5,7 @@
 library localExportTest;
 
 import "package:expect/expect.dart";
-import 'local_export_a.dart';
+import 'local_a.dart';
 
 void main() {
   Expect.equals(42, new A().method());
diff --git a/tests/language_2/export_main_override_test.dart b/tests/language_2/export/main_override_test.dart
similarity index 100%
rename from tests/language_2/export_main_override_test.dart
rename to tests/language_2/export/main_override_test.dart
diff --git a/tests/language_2/export_main_test.dart b/tests/language_2/export/main_test.dart
similarity index 100%
rename from tests/language_2/export_main_test.dart
rename to tests/language_2/export/main_test.dart
diff --git a/tests/language_2/export_not_shadowed_by_prefix_helper.dart b/tests/language_2/export/not_shadowed_by_prefix_helper.dart
similarity index 82%
rename from tests/language_2/export_not_shadowed_by_prefix_helper.dart
rename to tests/language_2/export/not_shadowed_by_prefix_helper.dart
index 3dcd016c6b4..d6d44fd5ded 100644
--- a/tests/language_2/export_not_shadowed_by_prefix_helper.dart
+++ b/tests/language_2/export/not_shadowed_by_prefix_helper.dart
@@ -2,5 +2,5 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export "export_not_shadowed_by_prefix_helper2.dart";
+export "not_shadowed_by_prefix_helper2.dart";
 import "dart:core" as f;
diff --git a/tests/language_2/export_not_shadowed_by_prefix_helper2.dart b/tests/language_2/export/not_shadowed_by_prefix_helper2.dart
similarity index 100%
rename from tests/language_2/export_not_shadowed_by_prefix_helper2.dart
rename to tests/language_2/export/not_shadowed_by_prefix_helper2.dart
diff --git a/tests/language_2/export_not_shadowed_by_prefix_test.dart b/tests/language_2/export/not_shadowed_by_prefix_test.dart
similarity index 88%
rename from tests/language_2/export_not_shadowed_by_prefix_test.dart
rename to tests/language_2/export/not_shadowed_by_prefix_test.dart
index 3af1b48652a..6cebd57dfc5 100644
--- a/tests/language_2/export_not_shadowed_by_prefix_test.dart
+++ b/tests/language_2/export/not_shadowed_by_prefix_test.dart
@@ -6,7 +6,7 @@
 // names re-exported by that library.
 
 import "package:expect/expect.dart";
-import "export_not_shadowed_by_prefix_helper.dart";
+import "not_shadowed_by_prefix_helper.dart";
 
 main() {
   f();
diff --git a/tests/language_2/export/order_helper1.dart b/tests/language_2/export/order_helper1.dart
new file mode 100644
index 00000000000..68dd448cc41
--- /dev/null
+++ b/tests/language_2/export/order_helper1.dart
@@ -0,0 +1,6 @@
+// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+export 'order_test.dart';
+export 'order_helper2.dart' show z;
diff --git a/tests/language_2/export_order_helper2.dart b/tests/language_2/export/order_helper2.dart
similarity index 88%
rename from tests/language_2/export_order_helper2.dart
rename to tests/language_2/export/order_helper2.dart
index 2c462a4ed59..7effbfb5e3b 100644
--- a/tests/language_2/export_order_helper2.dart
+++ b/tests/language_2/export/order_helper2.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'export_order_helper1.dart';
+import 'order_helper1.dart';
 
 class Info {
   int x = y;
diff --git a/tests/language_2/export_order_test.dart b/tests/language_2/export/order_test.dart
similarity index 83%
rename from tests/language_2/export_order_test.dart
rename to tests/language_2/export/order_test.dart
index 861b5da96f0..94cb915c3ff 100644
--- a/tests/language_2/export_order_test.dart
+++ b/tests/language_2/export/order_test.dart
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:expect/expect.dart';
-import 'export_order_helper1.dart' as bar;
-import 'export_order_helper2.dart';
+import 'order_helper1.dart' as bar;
+import 'order_helper2.dart';
 
 final y = 38;
 final info = new Info();
diff --git a/tests/language_2/export_private_runtime_test.dart b/tests/language_2/export/private_runtime_test.dart
similarity index 100%
rename from tests/language_2/export_private_runtime_test.dart
rename to tests/language_2/export/private_runtime_test.dart
diff --git a/tests/language_2/export_private_test.dart b/tests/language_2/export/private_test.dart
similarity index 100%
rename from tests/language_2/export_private_test.dart
rename to tests/language_2/export/private_test.dart
diff --git a/tests/language_2/reexport_core_helper.dart b/tests/language_2/export/reexport_core_helper.dart
similarity index 100%
rename from tests/language_2/reexport_core_helper.dart
rename to tests/language_2/export/reexport_core_helper.dart
diff --git a/tests/language_2/reexport_core_test.dart b/tests/language_2/export/reexport_core_test.dart
similarity index 100%
rename from tests/language_2/reexport_core_test.dart
rename to tests/language_2/export/reexport_core_test.dart
diff --git a/tests/language_2/top_level_entry.dart b/tests/language_2/export/top_level_entry.dart
similarity index 100%
rename from tests/language_2/top_level_entry.dart
rename to tests/language_2/export/top_level_entry.dart
diff --git a/tests/language_2/top_level_entry_test.dart b/tests/language_2/export/top_level_entry_test.dart
similarity index 100%
rename from tests/language_2/top_level_entry_test.dart
rename to tests/language_2/export/top_level_entry_test.dart
diff --git a/tests/language_2/factory_and_instance_variable_runtime_test.dart b/tests/language_2/factory/and_instance_variable_runtime_test.dart
similarity index 100%
rename from tests/language_2/factory_and_instance_variable_runtime_test.dart
rename to tests/language_2/factory/and_instance_variable_runtime_test.dart
diff --git a/tests/language_2/factory_and_instance_variable_test.dart b/tests/language_2/factory/and_instance_variable_test.dart
similarity index 100%
rename from tests/language_2/factory_and_instance_variable_test.dart
rename to tests/language_2/factory/and_instance_variable_test.dart
diff --git a/tests/language_2/factory_arrow_test.dart b/tests/language_2/factory/arrow_test.dart
similarity index 100%
rename from tests/language_2/factory_arrow_test.dart
rename to tests/language_2/factory/arrow_test.dart
diff --git a/tests/language_2/factory1_test.dart b/tests/language_2/factory/factory1_test.dart
similarity index 100%
rename from tests/language_2/factory1_test.dart
rename to tests/language_2/factory/factory1_test.dart
diff --git a/tests/language_2/factory2_test.dart b/tests/language_2/factory/factory2_test.dart
similarity index 100%
rename from tests/language_2/factory2_test.dart
rename to tests/language_2/factory/factory2_test.dart
diff --git a/tests/language_2/factory3_test.dart b/tests/language_2/factory/factory3_test.dart
similarity index 100%
rename from tests/language_2/factory3_test.dart
rename to tests/language_2/factory/factory3_test.dart
diff --git a/tests/language_2/factory4_runtime_test.dart b/tests/language_2/factory/factory4_runtime_test.dart
similarity index 100%
rename from tests/language_2/factory4_runtime_test.dart
rename to tests/language_2/factory/factory4_runtime_test.dart
diff --git a/tests/language_2/factory4_test.dart b/tests/language_2/factory/factory4_test.dart
similarity index 100%
rename from tests/language_2/factory4_test.dart
rename to tests/language_2/factory/factory4_test.dart
diff --git a/tests/language_2/factory5_runtime_test.dart b/tests/language_2/factory/factory5_runtime_test.dart
similarity index 100%
rename from tests/language_2/factory5_runtime_test.dart
rename to tests/language_2/factory/factory5_runtime_test.dart
diff --git a/tests/language_2/factory5_test.dart b/tests/language_2/factory/factory5_test.dart
similarity index 100%
rename from tests/language_2/factory5_test.dart
rename to tests/language_2/factory/factory5_test.dart
diff --git a/tests/language_2/factory6_runtime_test.dart b/tests/language_2/factory/factory6_runtime_test.dart
similarity index 100%
rename from tests/language_2/factory6_runtime_test.dart
rename to tests/language_2/factory/factory6_runtime_test.dart
diff --git a/tests/language_2/factory6_test.dart b/tests/language_2/factory/factory6_test.dart
similarity index 100%
rename from tests/language_2/factory6_test.dart
rename to tests/language_2/factory/factory6_test.dart
diff --git a/tests/language_2/factory_test.dart b/tests/language_2/factory/factory_test.dart
similarity index 100%
rename from tests/language_2/factory_test.dart
rename to tests/language_2/factory/factory_test.dart
diff --git a/tests/language_2/factory_implementation_test.dart b/tests/language_2/factory/implementation_test.dart
similarity index 100%
rename from tests/language_2/factory_implementation_test.dart
rename to tests/language_2/factory/implementation_test.dart
diff --git a/tests/language_2/factory_redirection2_runtime_test.dart b/tests/language_2/factory/redirection2_runtime_test.dart
similarity index 100%
rename from tests/language_2/factory_redirection2_runtime_test.dart
rename to tests/language_2/factory/redirection2_runtime_test.dart
diff --git a/tests/language_2/factory_redirection2_test.dart b/tests/language_2/factory/redirection2_test.dart
similarity index 100%
rename from tests/language_2/factory_redirection2_test.dart
rename to tests/language_2/factory/redirection2_test.dart
diff --git a/tests/language_2/factory_redirection3_cyclic_runtime_test.dart b/tests/language_2/factory/redirection3_cyclic_runtime_test.dart
similarity index 100%
rename from tests/language_2/factory_redirection3_cyclic_runtime_test.dart
rename to tests/language_2/factory/redirection3_cyclic_runtime_test.dart
diff --git a/tests/language_2/factory_redirection3_cyclic_test.dart b/tests/language_2/factory/redirection3_cyclic_test.dart
similarity index 100%
rename from tests/language_2/factory_redirection3_cyclic_test.dart
rename to tests/language_2/factory/redirection3_cyclic_test.dart
diff --git a/tests/language_2/factory_redirection_test.dart b/tests/language_2/factory/redirection_test.dart
similarity index 100%
rename from tests/language_2/factory_redirection_test.dart
rename to tests/language_2/factory/redirection_test.dart
diff --git a/tests/language_2/factory_return_type_checked_runtime_test.dart b/tests/language_2/factory/return_type_checked_runtime_test.dart
similarity index 100%
rename from tests/language_2/factory_return_type_checked_runtime_test.dart
rename to tests/language_2/factory/return_type_checked_runtime_test.dart
diff --git a/tests/language_2/factory_return_type_checked_test.dart b/tests/language_2/factory/return_type_checked_test.dart
similarity index 100%
rename from tests/language_2/factory_return_type_checked_test.dart
rename to tests/language_2/factory/return_type_checked_test.dart
diff --git a/tests/language_2/factory_runtime_test.dart b/tests/language_2/factory/runtime_test.dart
similarity index 100%
rename from tests/language_2/factory_runtime_test.dart
rename to tests/language_2/factory/runtime_test.dart
diff --git a/tests/language_2/factory_type_parameter2_test.dart b/tests/language_2/factory/type_parameter2_test.dart
similarity index 100%
rename from tests/language_2/factory_type_parameter2_test.dart
rename to tests/language_2/factory/type_parameter2_test.dart
diff --git a/tests/language_2/factory_type_parameter_test.dart b/tests/language_2/factory/type_parameter_test.dart
similarity index 100%
rename from tests/language_2/factory_type_parameter_test.dart
rename to tests/language_2/factory/type_parameter_test.dart
diff --git a/tests/language_2/factory_with_type_parameters_test.dart b/tests/language_2/factory/with_type_parameters_test.dart
similarity index 100%
rename from tests/language_2/factory_with_type_parameters_test.dart
rename to tests/language_2/factory/with_type_parameters_test.dart
diff --git a/tests/language_2/field_decl_missing_var_type_runtime_test.dart b/tests/language_2/field/decl_missing_var_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/field_decl_missing_var_type_runtime_test.dart
rename to tests/language_2/field/decl_missing_var_type_runtime_test.dart
diff --git a/tests/language_2/field_decl_missing_var_type_test.dart b/tests/language_2/field/decl_missing_var_type_test.dart
similarity index 100%
rename from tests/language_2/field_decl_missing_var_type_test.dart
rename to tests/language_2/field/decl_missing_var_type_test.dart
diff --git a/tests/language_2/field1_test.dart b/tests/language_2/field/field1_test.dart
similarity index 100%
rename from tests/language_2/field1_test.dart
rename to tests/language_2/field/field1_test.dart
diff --git a/tests/language_2/field2_test.dart b/tests/language_2/field/field2_test.dart
similarity index 100%
rename from tests/language_2/field2_test.dart
rename to tests/language_2/field/field2_test.dart
diff --git a/tests/language_2/field3_test.dart b/tests/language_2/field/field3_test.dart
similarity index 100%
rename from tests/language_2/field3_test.dart
rename to tests/language_2/field/field3_test.dart
diff --git a/tests/language_2/field4_test.dart b/tests/language_2/field/field4_test.dart
similarity index 100%
rename from tests/language_2/field4_test.dart
rename to tests/language_2/field/field4_test.dart
diff --git a/tests/language_2/field5_test.dart b/tests/language_2/field/field5_test.dart
similarity index 100%
rename from tests/language_2/field5_test.dart
rename to tests/language_2/field/field5_test.dart
diff --git a/tests/language_2/field6_test.dart b/tests/language_2/field/field6_test.dart
similarity index 100%
rename from tests/language_2/field6_test.dart
rename to tests/language_2/field/field6_test.dart
diff --git a/tests/language_2/field_test.dart b/tests/language_2/field/field_test.dart
similarity index 100%
rename from tests/language_2/field_test.dart
rename to tests/language_2/field/field_test.dart
diff --git a/tests/language_2/field_increment_bailout_test.dart b/tests/language_2/field/increment_bailout_test.dart
similarity index 100%
rename from tests/language_2/field_increment_bailout_test.dart
rename to tests/language_2/field/increment_bailout_test.dart
diff --git a/tests/language_2/field_inference_test.dart b/tests/language_2/field/inference_test.dart
similarity index 100%
rename from tests/language_2/field_inference_test.dart
rename to tests/language_2/field/inference_test.dart
diff --git a/tests/language_2/field_initialization_order_test.dart b/tests/language_2/field/initialization_order_test.dart
similarity index 100%
rename from tests/language_2/field_initialization_order_test.dart
rename to tests/language_2/field/initialization_order_test.dart
diff --git a/tests/language_2/field_method4_test.dart b/tests/language_2/field/method4_test.dart
similarity index 100%
rename from tests/language_2/field_method4_test.dart
rename to tests/language_2/field/method4_test.dart
diff --git a/tests/language_2/field_method_test.dart b/tests/language_2/field/method_test.dart
similarity index 100%
rename from tests/language_2/field_method_test.dart
rename to tests/language_2/field/method_test.dart
diff --git a/tests/language_2/field_optimization2_test.dart b/tests/language_2/field/optimization2_test.dart
similarity index 100%
rename from tests/language_2/field_optimization2_test.dart
rename to tests/language_2/field/optimization2_test.dart
diff --git a/tests/language_2/field_optimization3_test.dart b/tests/language_2/field/optimization3_test.dart
similarity index 100%
rename from tests/language_2/field_optimization3_test.dart
rename to tests/language_2/field/optimization3_test.dart
diff --git a/tests/language_2/field_optimization_test.dart b/tests/language_2/field/optimization_test.dart
similarity index 100%
rename from tests/language_2/field_optimization_test.dart
rename to tests/language_2/field/optimization_test.dart
diff --git a/tests/language_2/field_override2_test.dart b/tests/language_2/field/override2_test.dart
similarity index 100%
rename from tests/language_2/field_override2_test.dart
rename to tests/language_2/field/override2_test.dart
diff --git a/tests/language_2/field_override3_test.dart b/tests/language_2/field/override3_test.dart
similarity index 100%
rename from tests/language_2/field_override3_test.dart
rename to tests/language_2/field/override3_test.dart
diff --git a/tests/language_2/field_override4_test.dart b/tests/language_2/field/override4_test.dart
similarity index 100%
rename from tests/language_2/field_override4_test.dart
rename to tests/language_2/field/override4_test.dart
diff --git a/tests/language_2/field_override_optimization_test.dart b/tests/language_2/field/override_optimization_test.dart
similarity index 100%
rename from tests/language_2/field_override_optimization_test.dart
rename to tests/language_2/field/override_optimization_test.dart
diff --git a/tests/language_2/field_override_test.dart b/tests/language_2/field/override_test.dart
similarity index 100%
rename from tests/language_2/field_override_test.dart
rename to tests/language_2/field/override_test.dart
diff --git a/tests/language_2/field_parameter_test.dart b/tests/language_2/field/parameter_test.dart
similarity index 100%
rename from tests/language_2/field_parameter_test.dart
rename to tests/language_2/field/parameter_test.dart
diff --git a/tests/language_2/field_super_access2_test.dart b/tests/language_2/field/super_access2_test.dart
similarity index 100%
rename from tests/language_2/field_super_access2_test.dart
rename to tests/language_2/field/super_access2_test.dart
diff --git a/tests/language_2/field_super_access_test.dart b/tests/language_2/field/super_access_test.dart
similarity index 100%
rename from tests/language_2/field_super_access_test.dart
rename to tests/language_2/field/super_access_test.dart
diff --git a/tests/language_2/field_type_check2_test.dart b/tests/language_2/field/type_check2_test.dart
similarity index 100%
rename from tests/language_2/field_type_check2_test.dart
rename to tests/language_2/field/type_check2_test.dart
diff --git a/tests/language_2/field_type_check_runtime_test.dart b/tests/language_2/field/type_check_runtime_test.dart
similarity index 100%
rename from tests/language_2/field_type_check_runtime_test.dart
rename to tests/language_2/field/type_check_runtime_test.dart
diff --git a/tests/language_2/field_type_check_test.dart b/tests/language_2/field/type_check_test.dart
similarity index 100%
rename from tests/language_2/field_type_check_test.dart
rename to tests/language_2/field/type_check_test.dart
diff --git a/tests/language_2/field_wierd_name_test.dart b/tests/language_2/field/wierd_name_test.dart
similarity index 100%
rename from tests/language_2/field_wierd_name_test.dart
rename to tests/language_2/field/wierd_name_test.dart
diff --git a/tests/language_2/final_attempt_reinitialization_runtime_test.dart b/tests/language_2/final/attempt_reinitialization_runtime_test.dart
similarity index 100%
rename from tests/language_2/final_attempt_reinitialization_runtime_test.dart
rename to tests/language_2/final/attempt_reinitialization_runtime_test.dart
diff --git a/tests/language_2/final_attempt_reinitialization_test.dart b/tests/language_2/final/attempt_reinitialization_test.dart
similarity index 100%
rename from tests/language_2/final_attempt_reinitialization_test.dart
rename to tests/language_2/final/attempt_reinitialization_test.dart
diff --git a/tests/language_2/final_field_initialization_order_test.dart b/tests/language_2/final/field_initialization_order_test.dart
similarity index 100%
rename from tests/language_2/final_field_initialization_order_test.dart
rename to tests/language_2/final/field_initialization_order_test.dart
diff --git a/tests/language_2/final_field_override_test.dart b/tests/language_2/final/field_override_test.dart
similarity index 100%
rename from tests/language_2/final_field_override_test.dart
rename to tests/language_2/final/field_override_test.dart
diff --git a/tests/language_2/final_for_in_variable_test.dart b/tests/language_2/final/for_in_variable_test.dart
similarity index 100%
rename from tests/language_2/final_for_in_variable_test.dart
rename to tests/language_2/final/for_in_variable_test.dart
diff --git a/tests/language_2/final_initializer_instance_reference_test.dart b/tests/language_2/final/initializer_instance_reference_test.dart
similarity index 100%
rename from tests/language_2/final_initializer_instance_reference_test.dart
rename to tests/language_2/final/initializer_instance_reference_test.dart
diff --git a/tests/language_2/final_is_not_const_test.dart b/tests/language_2/final/is_not_const_test.dart
similarity index 100%
rename from tests/language_2/final_is_not_const_test.dart
rename to tests/language_2/final/is_not_const_test.dart
diff --git a/tests/language_2/final_param_test.dart b/tests/language_2/final/param_test.dart
similarity index 100%
rename from tests/language_2/final_param_test.dart
rename to tests/language_2/final/param_test.dart
diff --git a/tests/language_2/final_super_field_set_test.dart b/tests/language_2/final/super_field_set_test.dart
similarity index 100%
rename from tests/language_2/final_super_field_set_test.dart
rename to tests/language_2/final/super_field_set_test.dart
diff --git a/tests/language_2/final_syntax_test.dart b/tests/language_2/final/syntax_test.dart
similarity index 100%
rename from tests/language_2/final_syntax_test.dart
rename to tests/language_2/final/syntax_test.dart
diff --git a/tests/language_2/final_used_in_try_test.dart b/tests/language_2/final/used_in_try_test.dart
similarity index 100%
rename from tests/language_2/final_used_in_try_test.dart
rename to tests/language_2/final/used_in_try_test.dart
diff --git a/tests/language_2/final_variable_assignment_runtime_test.dart b/tests/language_2/final/variable_assignment_runtime_test.dart
similarity index 100%
rename from tests/language_2/final_variable_assignment_runtime_test.dart
rename to tests/language_2/final/variable_assignment_runtime_test.dart
diff --git a/tests/language_2/final_variable_assignment_test.dart b/tests/language_2/final/variable_assignment_test.dart
similarity index 100%
rename from tests/language_2/final_variable_assignment_test.dart
rename to tests/language_2/final/variable_assignment_test.dart
diff --git a/tests/language_2/function_apply_generic2_test.dart b/tests/language_2/function/apply_generic2_test.dart
similarity index 100%
rename from tests/language_2/function_apply_generic2_test.dart
rename to tests/language_2/function/apply_generic2_test.dart
diff --git a/tests/language_2/function_apply_generic_test.dart b/tests/language_2/function/apply_generic_test.dart
similarity index 100%
rename from tests/language_2/function_apply_generic_test.dart
rename to tests/language_2/function/apply_generic_test.dart
diff --git a/tests/language_2/function_argument_test.dart b/tests/language_2/function/argument_test.dart
similarity index 100%
rename from tests/language_2/function_argument_test.dart
rename to tests/language_2/function/argument_test.dart
diff --git a/tests/language_2/function_call_generic_test.dart b/tests/language_2/function/call_generic_test.dart
similarity index 100%
rename from tests/language_2/function_call_generic_test.dart
rename to tests/language_2/function/call_generic_test.dart
diff --git a/tests/language_2/function_field_test.dart b/tests/language_2/function/field_test.dart
similarity index 100%
rename from tests/language_2/function_field_test.dart
rename to tests/language_2/function/field_test.dart
diff --git a/tests/language_2/function_test.dart b/tests/language_2/function/function_test.dart
similarity index 100%
rename from tests/language_2/function_test.dart
rename to tests/language_2/function/function_test.dart
diff --git a/tests/language_2/function_getter_test.dart b/tests/language_2/function/getter_test.dart
similarity index 100%
rename from tests/language_2/function_getter_test.dart
rename to tests/language_2/function/getter_test.dart
diff --git a/tests/language_2/function_literals2_test.dart b/tests/language_2/function/literals2_test.dart
similarity index 100%
rename from tests/language_2/function_literals2_test.dart
rename to tests/language_2/function/literals2_test.dart
diff --git a/tests/language_2/function_literals_test.dart b/tests/language_2/function/literals_test.dart
similarity index 100%
rename from tests/language_2/function_literals_test.dart
rename to tests/language_2/function/literals_test.dart
diff --git a/tests/language_2/local_function2_test.dart b/tests/language_2/function/local2_test.dart
similarity index 100%
rename from tests/language_2/local_function2_test.dart
rename to tests/language_2/function/local2_test.dart
diff --git a/tests/language_2/local_function3_test.dart b/tests/language_2/function/local3_test.dart
similarity index 100%
rename from tests/language_2/local_function3_test.dart
rename to tests/language_2/function/local3_test.dart
diff --git a/tests/language_2/local_function_test.dart b/tests/language_2/function/local_function_test.dart
similarity index 100%
rename from tests/language_2/local_function_test.dart
rename to tests/language_2/function/local_function_test.dart
diff --git a/tests/language_2/local_function_non_equal_test.dart b/tests/language_2/function/local_non_equal_test.dart
similarity index 100%
rename from tests/language_2/local_function_non_equal_test.dart
rename to tests/language_2/function/local_non_equal_test.dart
diff --git a/tests/language_2/function_malformed_result_type_runtime_test.dart b/tests/language_2/function/malformed_result_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/function_malformed_result_type_runtime_test.dart
rename to tests/language_2/function/malformed_result_type_runtime_test.dart
diff --git a/tests/language_2/function_malformed_result_type_test.dart b/tests/language_2/function/malformed_result_type_test.dart
similarity index 100%
rename from tests/language_2/function_malformed_result_type_test.dart
rename to tests/language_2/function/malformed_result_type_test.dart
diff --git a/tests/language_2/function_propagation_test.dart b/tests/language_2/function/propagation_test.dart
similarity index 100%
rename from tests/language_2/function_propagation_test.dart
rename to tests/language_2/function/propagation_test.dart
diff --git a/tests/language_2/function_syntax_test.dart b/tests/language_2/function/syntax_test.dart
similarity index 100%
rename from tests/language_2/function_syntax_test.dart
rename to tests/language_2/function/syntax_test.dart
diff --git a/tests/language_2/function_type2_test.dart b/tests/language_2/function/type2_test.dart
similarity index 100%
rename from tests/language_2/function_type2_test.dart
rename to tests/language_2/function/type2_test.dart
diff --git a/tests/language_2/function_type3_test.dart b/tests/language_2/function/type3_test.dart
similarity index 100%
rename from tests/language_2/function_type3_test.dart
rename to tests/language_2/function/type3_test.dart
diff --git a/tests/language_2/function_type_alias10_test.dart b/tests/language_2/function/type_alias10_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias10_test.dart
rename to tests/language_2/function/type_alias10_test.dart
diff --git a/tests/language_2/function_type_alias2_test.dart b/tests/language_2/function/type_alias2_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias2_test.dart
rename to tests/language_2/function/type_alias2_test.dart
diff --git a/tests/language_2/function_type_alias3_test.dart b/tests/language_2/function/type_alias3_test.dart
similarity index 95%
rename from tests/language_2/function_type_alias3_test.dart
rename to tests/language_2/function/type_alias3_test.dart
index dad6b8a71b1..01b82f438e1 100644
--- a/tests/language_2/function_type_alias3_test.dart
+++ b/tests/language_2/function/type_alias3_test.dart
@@ -5,7 +5,7 @@
 // Dart test for function type alias with an imported result type that happens
 // to have the same name as a type parameter.
 import "package:expect/expect.dart";
-import "library11.dart" as lib11;
+import "../library11.dart" as lib11;
 
 typedef lib11.Library111<Library111> F<Library111>(
     lib11.Library111<Library111> a, Library111 b);
diff --git a/tests/language_2/function_type_alias4_test.dart b/tests/language_2/function/type_alias4_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias4_test.dart
rename to tests/language_2/function/type_alias4_test.dart
diff --git a/tests/language_2/function_type_alias5_test.dart b/tests/language_2/function/type_alias5_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias5_test.dart
rename to tests/language_2/function/type_alias5_test.dart
diff --git a/tests/language_2/function_type_alias6_runtime_test.dart b/tests/language_2/function/type_alias6_runtime_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias6_runtime_test.dart
rename to tests/language_2/function/type_alias6_runtime_test.dart
diff --git a/tests/language_2/function_type_alias6_test.dart b/tests/language_2/function/type_alias6_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias6_test.dart
rename to tests/language_2/function/type_alias6_test.dart
diff --git a/tests/language_2/function_type_alias7_test.dart b/tests/language_2/function/type_alias7_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias7_test.dart
rename to tests/language_2/function/type_alias7_test.dart
diff --git a/tests/language_2/function_type_alias8_test.dart b/tests/language_2/function/type_alias8_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias8_test.dart
rename to tests/language_2/function/type_alias8_test.dart
diff --git a/tests/language_2/function_type_alias9_runtime_test.dart b/tests/language_2/function/type_alias9_runtime_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias9_runtime_test.dart
rename to tests/language_2/function/type_alias9_runtime_test.dart
diff --git a/tests/language_2/function_type_alias9_test.dart b/tests/language_2/function/type_alias9_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias9_test.dart
rename to tests/language_2/function/type_alias9_test.dart
diff --git a/tests/language_2/function_type_alias_test.dart b/tests/language_2/function/type_alias_test.dart
similarity index 100%
rename from tests/language_2/function_type_alias_test.dart
rename to tests/language_2/function/type_alias_test.dart
diff --git a/tests/language_2/function_type_call_getter2_runtime_test.dart b/tests/language_2/function/type_call_getter2_runtime_test.dart
similarity index 100%
rename from tests/language_2/function_type_call_getter2_runtime_test.dart
rename to tests/language_2/function/type_call_getter2_runtime_test.dart
diff --git a/tests/language_2/function_type_call_getter2_test.dart b/tests/language_2/function/type_call_getter2_test.dart
similarity index 100%
rename from tests/language_2/function_type_call_getter2_test.dart
rename to tests/language_2/function/type_call_getter2_test.dart
diff --git a/tests/language_2/function_type_call_getter_test.dart b/tests/language_2/function/type_call_getter_test.dart
similarity index 100%
rename from tests/language_2/function_type_call_getter_test.dart
rename to tests/language_2/function/type_call_getter_test.dart
diff --git a/tests/language_2/function_type_in_constant_test.dart b/tests/language_2/function/type_in_constant_test.dart
similarity index 100%
rename from tests/language_2/function_type_in_constant_test.dart
rename to tests/language_2/function/type_in_constant_test.dart
diff --git a/tests/language_2/function_type_parameter2_test.dart b/tests/language_2/function/type_parameter2_test.dart
similarity index 100%
rename from tests/language_2/function_type_parameter2_test.dart
rename to tests/language_2/function/type_parameter2_test.dart
diff --git a/tests/language_2/function_type_parameter3_test.dart b/tests/language_2/function/type_parameter3_test.dart
similarity index 100%
rename from tests/language_2/function_type_parameter3_test.dart
rename to tests/language_2/function/type_parameter3_test.dart
diff --git a/tests/language_2/function_type_parameter_bound_object_test.dart b/tests/language_2/function/type_parameter_bound_object_test.dart
similarity index 100%
rename from tests/language_2/function_type_parameter_bound_object_test.dart
rename to tests/language_2/function/type_parameter_bound_object_test.dart
diff --git a/tests/language_2/function_type_parameter_test.dart b/tests/language_2/function/type_parameter_test.dart
similarity index 100%
rename from tests/language_2/function_type_parameter_test.dart
rename to tests/language_2/function/type_parameter_test.dart
diff --git a/tests/language_2/function_type_test.dart b/tests/language_2/function/type_test.dart
similarity index 100%
rename from tests/language_2/function_type_test.dart
rename to tests/language_2/function/type_test.dart
diff --git a/tests/language_2/function_type_this_parameter_test.dart b/tests/language_2/function/type_this_parameter_test.dart
similarity index 100%
rename from tests/language_2/function_type_this_parameter_test.dart
rename to tests/language_2/function/type_this_parameter_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure0_test.dart b/tests/language_2/function_subtype/bound_closure0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure0_test.dart
rename to tests/language_2/function_subtype/bound_closure0_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure1_test.dart b/tests/language_2/function_subtype/bound_closure1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure1_test.dart
rename to tests/language_2/function_subtype/bound_closure1_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure2_test.dart b/tests/language_2/function_subtype/bound_closure2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure2_test.dart
rename to tests/language_2/function_subtype/bound_closure2_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure3_test.dart b/tests/language_2/function_subtype/bound_closure3_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure3_test.dart
rename to tests/language_2/function_subtype/bound_closure3_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure4_test.dart b/tests/language_2/function_subtype/bound_closure4_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure4_test.dart
rename to tests/language_2/function_subtype/bound_closure4_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure5_test.dart b/tests/language_2/function_subtype/bound_closure5_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure5_test.dart
rename to tests/language_2/function_subtype/bound_closure5_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure5a_test.dart b/tests/language_2/function_subtype/bound_closure5a_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure5a_test.dart
rename to tests/language_2/function_subtype/bound_closure5a_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure6_test.dart b/tests/language_2/function_subtype/bound_closure6_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure6_test.dart
rename to tests/language_2/function_subtype/bound_closure6_test.dart
diff --git a/tests/language_2/function_subtype_bound_closure7_test.dart b/tests/language_2/function_subtype/bound_closure7_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_bound_closure7_test.dart
rename to tests/language_2/function_subtype/bound_closure7_test.dart
diff --git a/tests/language_2/function_subtype_call0_test.dart b/tests/language_2/function_subtype/call0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_call0_test.dart
rename to tests/language_2/function_subtype/call0_test.dart
diff --git a/tests/language_2/function_subtype_call1_test.dart b/tests/language_2/function_subtype/call1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_call1_test.dart
rename to tests/language_2/function_subtype/call1_test.dart
diff --git a/tests/language_2/function_subtype_call2_test.dart b/tests/language_2/function_subtype/call2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_call2_test.dart
rename to tests/language_2/function_subtype/call2_test.dart
diff --git a/tests/language_2/function_subtype_cast0_test.dart b/tests/language_2/function_subtype/cast0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_cast0_test.dart
rename to tests/language_2/function_subtype/cast0_test.dart
diff --git a/tests/language_2/function_subtype_cast1_test.dart b/tests/language_2/function_subtype/cast1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_cast1_test.dart
rename to tests/language_2/function_subtype/cast1_test.dart
diff --git a/tests/language_2/function_subtype_cast2_test.dart b/tests/language_2/function_subtype/cast2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_cast2_test.dart
rename to tests/language_2/function_subtype/cast2_test.dart
diff --git a/tests/language_2/function_subtype_cast3_test.dart b/tests/language_2/function_subtype/cast3_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_cast3_test.dart
rename to tests/language_2/function_subtype/cast3_test.dart
diff --git a/tests/language_2/function_subtype_checked0_test.dart b/tests/language_2/function_subtype/checked0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_checked0_test.dart
rename to tests/language_2/function_subtype/checked0_test.dart
diff --git a/tests/language_2/function_subtype_closure0_test.dart b/tests/language_2/function_subtype/closure0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_closure0_test.dart
rename to tests/language_2/function_subtype/closure0_test.dart
diff --git a/tests/language_2/function_subtype_closure1_test.dart b/tests/language_2/function_subtype/closure1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_closure1_test.dart
rename to tests/language_2/function_subtype/closure1_test.dart
diff --git a/tests/language_2/function_subtype_factory0_test.dart b/tests/language_2/function_subtype/factory0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_factory0_test.dart
rename to tests/language_2/function_subtype/factory0_test.dart
diff --git a/tests/language_2/function_subtype_factory1_test.dart b/tests/language_2/function_subtype/factory1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_factory1_test.dart
rename to tests/language_2/function_subtype/factory1_test.dart
diff --git a/tests/language_2/function_subtype0_test.dart b/tests/language_2/function_subtype/function_subtype0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype0_test.dart
rename to tests/language_2/function_subtype/function_subtype0_test.dart
diff --git a/tests/language_2/function_subtype1_test.dart b/tests/language_2/function_subtype/function_subtype1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype1_test.dart
rename to tests/language_2/function_subtype/function_subtype1_test.dart
diff --git a/tests/language_2/function_subtype2_test.dart b/tests/language_2/function_subtype/function_subtype2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype2_test.dart
rename to tests/language_2/function_subtype/function_subtype2_test.dart
diff --git a/tests/language_2/function_subtype3_test.dart b/tests/language_2/function_subtype/function_subtype3_test.dart
similarity index 100%
rename from tests/language_2/function_subtype3_test.dart
rename to tests/language_2/function_subtype/function_subtype3_test.dart
diff --git a/tests/language_2/function_subtype_inline0_test.dart b/tests/language_2/function_subtype/inline0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_inline0_test.dart
rename to tests/language_2/function_subtype/inline0_test.dart
diff --git a/tests/language_2/function_subtype_inline1_test.dart b/tests/language_2/function_subtype/inline1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_inline1_test.dart
rename to tests/language_2/function_subtype/inline1_test.dart
diff --git a/tests/language_2/function_subtype_inline2_test.dart b/tests/language_2/function_subtype/inline2_test.dart
similarity index 97%
rename from tests/language_2/function_subtype_inline2_test.dart
rename to tests/language_2/function_subtype/inline2_test.dart
index 147bd4a56b8..80ab19335a9 100644
--- a/tests/language_2/function_subtype_inline2_test.dart
+++ b/tests/language_2/function_subtype/inline2_test.dart
@@ -5,7 +5,7 @@
 
 // Check function subtyping of inlined function typed parameters.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class C {
   var field;
diff --git a/tests/language_2/function_subtype_local0_test.dart b/tests/language_2/function_subtype/local0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_local0_test.dart
rename to tests/language_2/function_subtype/local0_test.dart
diff --git a/tests/language_2/function_subtype_local1_test.dart b/tests/language_2/function_subtype/local1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_local1_test.dart
rename to tests/language_2/function_subtype/local1_test.dart
diff --git a/tests/language_2/function_subtype_local2_test.dart b/tests/language_2/function_subtype/local2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_local2_test.dart
rename to tests/language_2/function_subtype/local2_test.dart
diff --git a/tests/language_2/function_subtype_local3_test.dart b/tests/language_2/function_subtype/local3_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_local3_test.dart
rename to tests/language_2/function_subtype/local3_test.dart
diff --git a/tests/language_2/function_subtype_local4_test.dart b/tests/language_2/function_subtype/local4_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_local4_test.dart
rename to tests/language_2/function_subtype/local4_test.dart
diff --git a/tests/language_2/function_subtype_local5_test.dart b/tests/language_2/function_subtype/local5_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_local5_test.dart
rename to tests/language_2/function_subtype/local5_test.dart
diff --git a/tests/language_2/function_subtype_local6_test.dart b/tests/language_2/function_subtype/local6_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_local6_test.dart
rename to tests/language_2/function_subtype/local6_test.dart
diff --git a/tests/language_2/function_subtype_named1_test.dart b/tests/language_2/function_subtype/named1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_named1_test.dart
rename to tests/language_2/function_subtype/named1_test.dart
diff --git a/tests/language_2/function_subtype_named2_test.dart b/tests/language_2/function_subtype/named2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_named2_test.dart
rename to tests/language_2/function_subtype/named2_test.dart
diff --git a/tests/language_2/function_subtype_not0_test.dart b/tests/language_2/function_subtype/not0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_not0_test.dart
rename to tests/language_2/function_subtype/not0_test.dart
diff --git a/tests/language_2/function_subtype_not1_test.dart b/tests/language_2/function_subtype/not1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_not1_test.dart
rename to tests/language_2/function_subtype/not1_test.dart
diff --git a/tests/language_2/function_subtype_not2_test.dart b/tests/language_2/function_subtype/not2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_not2_test.dart
rename to tests/language_2/function_subtype/not2_test.dart
diff --git a/tests/language_2/function_subtype_not3_test.dart b/tests/language_2/function_subtype/not3_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_not3_test.dart
rename to tests/language_2/function_subtype/not3_test.dart
diff --git a/tests/language_2/function_subtype_null.dart b/tests/language_2/function_subtype/null.dart
similarity index 100%
rename from tests/language_2/function_subtype_null.dart
rename to tests/language_2/function_subtype/null.dart
diff --git a/tests/language_2/function_subtype_optional1_test.dart b/tests/language_2/function_subtype/optional1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_optional1_test.dart
rename to tests/language_2/function_subtype/optional1_test.dart
diff --git a/tests/language_2/function_subtype_optional2_test.dart b/tests/language_2/function_subtype/optional2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_optional2_test.dart
rename to tests/language_2/function_subtype/optional2_test.dart
diff --git a/tests/language_2/function_subtype_regression_ddc_588_test.dart b/tests/language_2/function_subtype/regression_ddc_588_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_regression_ddc_588_test.dart
rename to tests/language_2/function_subtype/regression_ddc_588_test.dart
diff --git a/tests/language_2/function_subtype_setter0_test.dart b/tests/language_2/function_subtype/setter0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_setter0_test.dart
rename to tests/language_2/function_subtype/setter0_test.dart
diff --git a/tests/language_2/function_subtype_simple0_test.dart b/tests/language_2/function_subtype/simple0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_simple0_test.dart
rename to tests/language_2/function_subtype/simple0_test.dart
diff --git a/tests/language_2/function_subtype_simple1_test.dart b/tests/language_2/function_subtype/simple1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_simple1_test.dart
rename to tests/language_2/function_subtype/simple1_test.dart
diff --git a/tests/language_2/function_subtype_simple2_test.dart b/tests/language_2/function_subtype/simple2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_simple2_test.dart
rename to tests/language_2/function_subtype/simple2_test.dart
diff --git a/tests/language_2/function_subtype_top_level0_test.dart b/tests/language_2/function_subtype/top_level0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_top_level0_test.dart
rename to tests/language_2/function_subtype/top_level0_test.dart
diff --git a/tests/language_2/function_subtype_top_level1_test.dart b/tests/language_2/function_subtype/top_level1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_top_level1_test.dart
rename to tests/language_2/function_subtype/top_level1_test.dart
diff --git a/tests/language_2/function_subtype_typearg0_test.dart b/tests/language_2/function_subtype/typearg0_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_typearg0_test.dart
rename to tests/language_2/function_subtype/typearg0_test.dart
diff --git a/tests/language_2/function_subtype_typearg1_test.dart b/tests/language_2/function_subtype/typearg1_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_typearg1_test.dart
rename to tests/language_2/function_subtype/typearg1_test.dart
diff --git a/tests/language_2/function_subtype_typearg2_test.dart b/tests/language_2/function_subtype/typearg2_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_typearg2_test.dart
rename to tests/language_2/function_subtype/typearg2_test.dart
diff --git a/tests/language_2/function_subtype_typearg3_test.dart b/tests/language_2/function_subtype/typearg3_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_typearg3_test.dart
rename to tests/language_2/function_subtype/typearg3_test.dart
diff --git a/tests/language_2/function_subtype_typearg5_test.dart b/tests/language_2/function_subtype/typearg5_test.dart
similarity index 100%
rename from tests/language_2/function_subtype_typearg5_test.dart
rename to tests/language_2/function_subtype/typearg5_test.dart
diff --git a/tests/language_2/generic_async_star_test.dart b/tests/language_2/generic/async_star_test.dart
similarity index 100%
rename from tests/language_2/generic_async_star_test.dart
rename to tests/language_2/generic/async_star_test.dart
diff --git a/tests/language_2/generic_async_test.dart b/tests/language_2/generic/async_test.dart
similarity index 100%
rename from tests/language_2/generic_async_test.dart
rename to tests/language_2/generic/async_test.dart
diff --git a/tests/language_2/cascaded_forwarding_stubs_generic_test.dart b/tests/language_2/generic/cascaded_forwarding_stubs_generic_test.dart
similarity index 100%
rename from tests/language_2/cascaded_forwarding_stubs_generic_test.dart
rename to tests/language_2/generic/cascaded_forwarding_stubs_generic_test.dart
diff --git a/tests/language_2/generic_closure_test.dart b/tests/language_2/generic/closure_test.dart
similarity index 100%
rename from tests/language_2/generic_closure_test.dart
rename to tests/language_2/generic/closure_test.dart
diff --git a/tests/language_2/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart b/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
similarity index 100%
rename from tests/language_2/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
rename to tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_infinite_test.dart
diff --git a/tests/language_2/conflicting_generic_interfaces_hierarchy_loop_test.dart b/tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
similarity index 100%
rename from tests/language_2/conflicting_generic_interfaces_hierarchy_loop_test.dart
rename to tests/language_2/generic/conflicting_generic_interfaces_hierarchy_loop_test.dart
diff --git a/tests/language_2/conflicting_generic_interfaces_no_conflict_test.dart b/tests/language_2/generic/conflicting_generic_interfaces_no_conflict_test.dart
similarity index 100%
rename from tests/language_2/conflicting_generic_interfaces_no_conflict_test.dart
rename to tests/language_2/generic/conflicting_generic_interfaces_no_conflict_test.dart
diff --git a/tests/language_2/conflicting_generic_interfaces_simple_test.dart b/tests/language_2/generic/conflicting_generic_interfaces_simple_test.dart
similarity index 100%
rename from tests/language_2/conflicting_generic_interfaces_simple_test.dart
rename to tests/language_2/generic/conflicting_generic_interfaces_simple_test.dart
diff --git a/tests/language_2/generic_constructor_mixin2_runtime_test.dart b/tests/language_2/generic/constructor_mixin2_runtime_test.dart
similarity index 94%
rename from tests/language_2/generic_constructor_mixin2_runtime_test.dart
rename to tests/language_2/generic/constructor_mixin2_runtime_test.dart
index d85d5d0fe40..969c8930681 100644
--- a/tests/language_2/generic_constructor_mixin2_runtime_test.dart
+++ b/tests/language_2/generic/constructor_mixin2_runtime_test.dart
@@ -8,7 +8,7 @@
 // Test that parameter types types are checked correctly in the face of
 // mixin application upon a generic constructor.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class A<X> {
   A(X x);
diff --git a/tests/language_2/generic_constructor_mixin2_test.dart b/tests/language_2/generic/constructor_mixin2_test.dart
similarity index 95%
rename from tests/language_2/generic_constructor_mixin2_test.dart
rename to tests/language_2/generic/constructor_mixin2_test.dart
index 13b2eed583b..6630e4e8ea0 100644
--- a/tests/language_2/generic_constructor_mixin2_test.dart
+++ b/tests/language_2/generic/constructor_mixin2_test.dart
@@ -5,7 +5,7 @@
 // Test that parameter types types are checked correctly in the face of
 // mixin application upon a generic constructor.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class A<X> {
   A(X x);
diff --git a/tests/language_2/generic_constructor_mixin3_runtime_test.dart b/tests/language_2/generic/constructor_mixin3_runtime_test.dart
similarity index 94%
rename from tests/language_2/generic_constructor_mixin3_runtime_test.dart
rename to tests/language_2/generic/constructor_mixin3_runtime_test.dart
index 7fd1c1afb3f..dfdd2bfe01a 100644
--- a/tests/language_2/generic_constructor_mixin3_runtime_test.dart
+++ b/tests/language_2/generic/constructor_mixin3_runtime_test.dart
@@ -8,7 +8,7 @@
 // Test that parameter types types are checked correctly in the face of
 // mixin application upon a generic constructor.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class A<X> {
   A(X x);
diff --git a/tests/language_2/generic_constructor_mixin3_test.dart b/tests/language_2/generic/constructor_mixin3_test.dart
similarity index 95%
rename from tests/language_2/generic_constructor_mixin3_test.dart
rename to tests/language_2/generic/constructor_mixin3_test.dart
index 5e1a90d50bd..7a1a21acec9 100644
--- a/tests/language_2/generic_constructor_mixin3_test.dart
+++ b/tests/language_2/generic/constructor_mixin3_test.dart
@@ -5,7 +5,7 @@
 // Test that parameter types types are checked correctly in the face of
 // mixin application upon a generic constructor.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class A<X> {
   A(X x);
diff --git a/tests/language_2/generic_constructor_mixin_runtime_test.dart b/tests/language_2/generic/constructor_mixin_runtime_test.dart
similarity index 93%
rename from tests/language_2/generic_constructor_mixin_runtime_test.dart
rename to tests/language_2/generic/constructor_mixin_runtime_test.dart
index 11eae8319db..31d7fd2b950 100644
--- a/tests/language_2/generic_constructor_mixin_runtime_test.dart
+++ b/tests/language_2/generic/constructor_mixin_runtime_test.dart
@@ -8,7 +8,7 @@
 // Test that parameter types types are checked correctly in the face of
 // mixin application upon a generic constructor.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class A<X> {
   A(X x);
diff --git a/tests/language_2/generic_constructor_mixin_test.dart b/tests/language_2/generic/constructor_mixin_test.dart
similarity index 95%
rename from tests/language_2/generic_constructor_mixin_test.dart
rename to tests/language_2/generic/constructor_mixin_test.dart
index 4812f1231d2..a2b828e5281 100644
--- a/tests/language_2/generic_constructor_mixin_test.dart
+++ b/tests/language_2/generic/constructor_mixin_test.dart
@@ -5,7 +5,7 @@
 // Test that parameter types types are checked correctly in the face of
 // mixin application upon a generic constructor.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class A<X> {
   A(X x);
diff --git a/tests/language_2/generic_creation_test.dart b/tests/language_2/generic/creation_test.dart
similarity index 100%
rename from tests/language_2/generic_creation_test.dart
rename to tests/language_2/generic/creation_test.dart
diff --git a/tests/language_2/generic_deep_test.dart b/tests/language_2/generic/deep_test.dart
similarity index 100%
rename from tests/language_2/generic_deep_test.dart
rename to tests/language_2/generic/deep_test.dart
diff --git a/tests/language_2/f_bounded_equality_test.dart b/tests/language_2/generic/f_bounded_equality_test.dart
similarity index 100%
rename from tests/language_2/f_bounded_equality_test.dart
rename to tests/language_2/generic/f_bounded_equality_test.dart
diff --git a/tests/language_2/f_bounded_quantification2_test.dart b/tests/language_2/generic/f_bounded_quantification2_test.dart
similarity index 100%
rename from tests/language_2/f_bounded_quantification2_test.dart
rename to tests/language_2/generic/f_bounded_quantification2_test.dart
diff --git a/tests/language_2/f_bounded_quantification3_test.dart b/tests/language_2/generic/f_bounded_quantification3_test.dart
similarity index 100%
rename from tests/language_2/f_bounded_quantification3_test.dart
rename to tests/language_2/generic/f_bounded_quantification3_test.dart
diff --git a/tests/language_2/f_bounded_quantification4_test.dart b/tests/language_2/generic/f_bounded_quantification4_test.dart
similarity index 100%
rename from tests/language_2/f_bounded_quantification4_test.dart
rename to tests/language_2/generic/f_bounded_quantification4_test.dart
diff --git a/tests/language_2/f_bounded_quantification5_test.dart b/tests/language_2/generic/f_bounded_quantification5_test.dart
similarity index 100%
rename from tests/language_2/f_bounded_quantification5_test.dart
rename to tests/language_2/generic/f_bounded_quantification5_test.dart
diff --git a/tests/language_2/f_bounded_quantification_runtime_test.dart b/tests/language_2/generic/f_bounded_quantification_runtime_test.dart
similarity index 100%
rename from tests/language_2/f_bounded_quantification_runtime_test.dart
rename to tests/language_2/generic/f_bounded_quantification_runtime_test.dart
diff --git a/tests/language_2/f_bounded_quantification_test.dart b/tests/language_2/generic/f_bounded_quantification_test.dart
similarity index 100%
rename from tests/language_2/f_bounded_quantification_test.dart
rename to tests/language_2/generic/f_bounded_quantification_test.dart
diff --git a/tests/language_2/generic_field_mixin2_test.dart b/tests/language_2/generic/field_mixin2_test.dart
similarity index 100%
rename from tests/language_2/generic_field_mixin2_test.dart
rename to tests/language_2/generic/field_mixin2_test.dart
diff --git a/tests/language_2/generic_field_mixin3_test.dart b/tests/language_2/generic/field_mixin3_test.dart
similarity index 100%
rename from tests/language_2/generic_field_mixin3_test.dart
rename to tests/language_2/generic/field_mixin3_test.dart
diff --git a/tests/language_2/generic_field_mixin4_test.dart b/tests/language_2/generic/field_mixin4_test.dart
similarity index 100%
rename from tests/language_2/generic_field_mixin4_test.dart
rename to tests/language_2/generic/field_mixin4_test.dart
diff --git a/tests/language_2/generic_field_mixin5_test.dart b/tests/language_2/generic/field_mixin5_test.dart
similarity index 100%
rename from tests/language_2/generic_field_mixin5_test.dart
rename to tests/language_2/generic/field_mixin5_test.dart
diff --git a/tests/language_2/generic_field_mixin6_runtime_test.dart b/tests/language_2/generic/field_mixin6_runtime_test.dart
similarity index 100%
rename from tests/language_2/generic_field_mixin6_runtime_test.dart
rename to tests/language_2/generic/field_mixin6_runtime_test.dart
diff --git a/tests/language_2/generic_field_mixin6_test.dart b/tests/language_2/generic/field_mixin6_test.dart
similarity index 100%
rename from tests/language_2/generic_field_mixin6_test.dart
rename to tests/language_2/generic/field_mixin6_test.dart
diff --git a/tests/language_2/generic_field_mixin_test.dart b/tests/language_2/generic/field_mixin_test.dart
similarity index 100%
rename from tests/language_2/generic_field_mixin_test.dart
rename to tests/language_2/generic/field_mixin_test.dart
diff --git a/tests/language_2/generic_function_bounds_test.dart b/tests/language_2/generic/function_bounds_test.dart
similarity index 100%
rename from tests/language_2/generic_function_bounds_test.dart
rename to tests/language_2/generic/function_bounds_test.dart
diff --git a/tests/language_2/generic_function_dcall_test.dart b/tests/language_2/generic/function_dcall_test.dart
similarity index 100%
rename from tests/language_2/generic_function_dcall_test.dart
rename to tests/language_2/generic/function_dcall_test.dart
diff --git a/tests/language_2/generic_function_subtype_parametrized_typedef_runtime_1_test.dart b/tests/language_2/generic/function_subtype_parametrized_typedef_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_parametrized_typedef_runtime_1_test.dart
rename to tests/language_2/generic/function_subtype_parametrized_typedef_runtime_1_test.dart
diff --git a/tests/language_2/generic_function_subtype_parametrized_typedef_runtime_2_test.dart b/tests/language_2/generic/function_subtype_parametrized_typedef_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_parametrized_typedef_runtime_2_test.dart
rename to tests/language_2/generic/function_subtype_parametrized_typedef_runtime_2_test.dart
diff --git a/tests/language_2/generic_function_subtype_parametrized_typedef_runtime_3_test.dart b/tests/language_2/generic/function_subtype_parametrized_typedef_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_parametrized_typedef_runtime_3_test.dart
rename to tests/language_2/generic/function_subtype_parametrized_typedef_runtime_3_test.dart
diff --git a/tests/language_2/generic_function_subtype_parametrized_typedef_runtime_test.dart b/tests/language_2/generic/function_subtype_parametrized_typedef_runtime_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_parametrized_typedef_runtime_test.dart
rename to tests/language_2/generic/function_subtype_parametrized_typedef_runtime_test.dart
diff --git a/tests/language_2/generic_function_subtype_parametrized_typedef_test.dart b/tests/language_2/generic/function_subtype_parametrized_typedef_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_parametrized_typedef_test.dart
rename to tests/language_2/generic/function_subtype_parametrized_typedef_test.dart
diff --git a/tests/language_2/generic_function_subtype_runtime_1_test.dart b/tests/language_2/generic/function_subtype_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_runtime_1_test.dart
rename to tests/language_2/generic/function_subtype_runtime_1_test.dart
diff --git a/tests/language_2/generic_function_subtype_runtime_2_test.dart b/tests/language_2/generic/function_subtype_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_runtime_2_test.dart
rename to tests/language_2/generic/function_subtype_runtime_2_test.dart
diff --git a/tests/language_2/generic_function_subtype_runtime_test.dart b/tests/language_2/generic/function_subtype_runtime_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_runtime_test.dart
rename to tests/language_2/generic/function_subtype_runtime_test.dart
diff --git a/tests/language_2/generic_function_subtype_test.dart b/tests/language_2/generic/function_subtype_test.dart
similarity index 100%
rename from tests/language_2/generic_function_subtype_test.dart
rename to tests/language_2/generic/function_subtype_test.dart
diff --git a/tests/language_2/generic_function_type_as_type_argument_runtime_1_test.dart b/tests/language_2/generic/function_type_as_type_argument_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/generic_function_type_as_type_argument_runtime_1_test.dart
rename to tests/language_2/generic/function_type_as_type_argument_runtime_1_test.dart
diff --git a/tests/language_2/generic_function_type_as_type_argument_runtime_test.dart b/tests/language_2/generic/function_type_as_type_argument_runtime_test.dart
similarity index 100%
rename from tests/language_2/generic_function_type_as_type_argument_runtime_test.dart
rename to tests/language_2/generic/function_type_as_type_argument_runtime_test.dart
diff --git a/tests/language_2/generic_function_type_as_type_argument_test.dart b/tests/language_2/generic/function_type_as_type_argument_test.dart
similarity index 100%
rename from tests/language_2/generic_function_type_as_type_argument_test.dart
rename to tests/language_2/generic/function_type_as_type_argument_test.dart
diff --git a/tests/language_2/generic_function_typedef2_runtime_test.dart b/tests/language_2/generic/function_typedef2_runtime_test.dart
similarity index 100%
rename from tests/language_2/generic_function_typedef2_runtime_test.dart
rename to tests/language_2/generic/function_typedef2_runtime_test.dart
diff --git a/tests/language_2/generic_function_typedef2_test.dart b/tests/language_2/generic/function_typedef2_test.dart
similarity index 100%
rename from tests/language_2/generic_function_typedef2_test.dart
rename to tests/language_2/generic/function_typedef2_test.dart
diff --git a/tests/language_2/generic_function_typedef_test.dart b/tests/language_2/generic/function_typedef_test.dart
similarity index 99%
rename from tests/language_2/generic_function_typedef_test.dart
rename to tests/language_2/generic/function_typedef_test.dart
index 9b16bdfb36b..a61b0b618f6 100644
--- a/tests/language_2/generic_function_typedef_test.dart
+++ b/tests/language_2/generic/function_typedef_test.dart
@@ -40,4 +40,4 @@ main() {
       "sound function types: cannot allow passing any Object to num"); //# 01: ok
   Expect.isTrue(foo3 is G<int>);
   Expect.isFalse(foo3 is G<bool>);
-}
\ No newline at end of file
+}
diff --git a/tests/language_2/generic_functions_test.dart b/tests/language_2/generic/functions_test.dart
similarity index 100%
rename from tests/language_2/generic_functions_test.dart
rename to tests/language_2/generic/functions_test.dart
diff --git a/tests/language_2/generic2_test.dart b/tests/language_2/generic/generic2_test.dart
similarity index 100%
rename from tests/language_2/generic2_test.dart
rename to tests/language_2/generic/generic2_test.dart
diff --git a/tests/language_2/generic_test.dart b/tests/language_2/generic/generic_test.dart
similarity index 100%
rename from tests/language_2/generic_test.dart
rename to tests/language_2/generic/generic_test.dart
diff --git a/tests/language_2/generics2_test.dart b/tests/language_2/generic/generics2_test.dart
similarity index 100%
rename from tests/language_2/generics2_test.dart
rename to tests/language_2/generic/generics2_test.dart
diff --git a/tests/language_2/generics3_test.dart b/tests/language_2/generic/generics3_test.dart
similarity index 100%
rename from tests/language_2/generics3_test.dart
rename to tests/language_2/generic/generics3_test.dart
diff --git a/tests/language_2/generics_test.dart b/tests/language_2/generic/generics_test.dart
similarity index 100%
rename from tests/language_2/generics_test.dart
rename to tests/language_2/generic/generics_test.dart
diff --git a/tests/language_2/generic_inheritance_test.dart b/tests/language_2/generic/inheritance_test.dart
similarity index 100%
rename from tests/language_2/generic_inheritance_test.dart
rename to tests/language_2/generic/inheritance_test.dart
diff --git a/tests/language_2/generic_instanceof.dart b/tests/language_2/generic/instanceof.dart
similarity index 100%
rename from tests/language_2/generic_instanceof.dart
rename to tests/language_2/generic/instanceof.dart
diff --git a/tests/language_2/generic_instanceof2_test.dart b/tests/language_2/generic/instanceof2_test.dart
similarity index 100%
rename from tests/language_2/generic_instanceof2_test.dart
rename to tests/language_2/generic/instanceof2_test.dart
diff --git a/tests/language_2/generic_instanceof3_test.dart b/tests/language_2/generic/instanceof3_test.dart
similarity index 100%
rename from tests/language_2/generic_instanceof3_test.dart
rename to tests/language_2/generic/instanceof3_test.dart
diff --git a/tests/language_2/generic_instanceof4_test.dart b/tests/language_2/generic/instanceof4_test.dart
similarity index 100%
rename from tests/language_2/generic_instanceof4_test.dart
rename to tests/language_2/generic/instanceof4_test.dart
diff --git a/tests/language_2/generic_instanceof5_test.dart b/tests/language_2/generic/instanceof5_test.dart
similarity index 100%
rename from tests/language_2/generic_instanceof5_test.dart
rename to tests/language_2/generic/instanceof5_test.dart
diff --git a/tests/language_2/generic_instanceof_test.dart b/tests/language_2/generic/instanceof_test.dart
similarity index 94%
rename from tests/language_2/generic_instanceof_test.dart
rename to tests/language_2/generic/instanceof_test.dart
index 5ff974b7f0b..46eda6417af 100644
--- a/tests/language_2/generic_instanceof_test.dart
+++ b/tests/language_2/generic/instanceof_test.dart
@@ -6,7 +6,7 @@
 library GenericInstanceofTest.dart;
 
 import "package:expect/expect.dart";
-part "generic_instanceof.dart";
+part "instanceof.dart";
 
 main() {
   // Repeat type checks so that inlined tests can be tested as well.
diff --git a/tests/language_2/instantiate_tearoff_after_contravariance_check_test.dart b/tests/language_2/generic/instantiate_tearoff_after_contravariance_check_test.dart
similarity index 100%
rename from tests/language_2/instantiate_tearoff_after_contravariance_check_test.dart
rename to tests/language_2/generic/instantiate_tearoff_after_contravariance_check_test.dart
diff --git a/tests/language_2/instantiate_tearoff_of_call_test.dart b/tests/language_2/generic/instantiate_tearoff_of_call_test.dart
similarity index 100%
rename from tests/language_2/instantiate_tearoff_of_call_test.dart
rename to tests/language_2/generic/instantiate_tearoff_of_call_test.dart
diff --git a/tests/language_2/instantiate_tearoff_test.dart b/tests/language_2/generic/instantiate_tearoff_test.dart
similarity index 100%
rename from tests/language_2/instantiate_tearoff_test.dart
rename to tests/language_2/generic/instantiate_tearoff_test.dart
diff --git a/tests/language_2/instantiate_to_bounds_super_bounded_test.dart b/tests/language_2/generic/instantiate_to_bounds_super_bounded_test.dart
similarity index 100%
rename from tests/language_2/instantiate_to_bounds_super_bounded_test.dart
rename to tests/language_2/generic/instantiate_to_bounds_super_bounded_test.dart
diff --git a/tests/language_2/instantiate_type_variable_runtime_test.dart b/tests/language_2/generic/instantiate_type_variable_runtime_test.dart
similarity index 100%
rename from tests/language_2/instantiate_type_variable_runtime_test.dart
rename to tests/language_2/generic/instantiate_type_variable_runtime_test.dart
diff --git a/tests/language_2/instantiate_type_variable_test.dart b/tests/language_2/generic/instantiate_type_variable_test.dart
similarity index 100%
rename from tests/language_2/instantiate_type_variable_test.dart
rename to tests/language_2/generic/instantiate_type_variable_test.dart
diff --git a/tests/language_2/generic_is_check_test.dart b/tests/language_2/generic/is_check_test.dart
similarity index 100%
rename from tests/language_2/generic_is_check_test.dart
rename to tests/language_2/generic/is_check_test.dart
diff --git a/tests/language_2/generic_list_checked_test.dart b/tests/language_2/generic/list_checked_test.dart
similarity index 100%
rename from tests/language_2/generic_list_checked_test.dart
rename to tests/language_2/generic/list_checked_test.dart
diff --git a/tests/language_2/generic_local_functions_test.dart b/tests/language_2/generic/local_functions_test.dart
similarity index 100%
rename from tests/language_2/generic_local_functions_test.dart
rename to tests/language_2/generic/local_functions_test.dart
diff --git a/tests/language_2/many_generic_instanceof_test.dart b/tests/language_2/generic/many_generic_instanceof_test.dart
similarity index 94%
rename from tests/language_2/many_generic_instanceof_test.dart
rename to tests/language_2/generic/many_generic_instanceof_test.dart
index be72feb1b15..ea9e1ebb172 100644
--- a/tests/language_2/many_generic_instanceof_test.dart
+++ b/tests/language_2/generic/many_generic_instanceof_test.dart
@@ -6,7 +6,7 @@
 library GenericInstanceofTest.dart;
 
 import "package:expect/expect.dart";
-part "generic_instanceof.dart";
+part "instanceof.dart";
 
 class ManyGenericInstanceofTest {
   static testMain() {
diff --git a/tests/language_2/generic_metadata_runtime_1_test.dart b/tests/language_2/generic/metadata_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/generic_metadata_runtime_1_test.dart
rename to tests/language_2/generic/metadata_runtime_1_test.dart
diff --git a/tests/language_2/generic_metadata_runtime_test.dart b/tests/language_2/generic/metadata_runtime_test.dart
similarity index 100%
rename from tests/language_2/generic_metadata_runtime_test.dart
rename to tests/language_2/generic/metadata_runtime_test.dart
diff --git a/tests/language_2/generic_metadata_test.dart b/tests/language_2/generic/metadata_test.dart
similarity index 100%
rename from tests/language_2/generic_metadata_test.dart
rename to tests/language_2/generic/metadata_test.dart
diff --git a/tests/language_2/generic_method_types_test.dart b/tests/language_2/generic/method_types_test.dart
similarity index 100%
rename from tests/language_2/generic_method_types_test.dart
rename to tests/language_2/generic/method_types_test.dart
diff --git a/tests/language_2/generic_mock_test.dart b/tests/language_2/generic/mock_test.dart
similarity index 100%
rename from tests/language_2/generic_mock_test.dart
rename to tests/language_2/generic/mock_test.dart
diff --git a/tests/language_2/generic_native_test.dart b/tests/language_2/generic/native_test.dart
similarity index 100%
rename from tests/language_2/generic_native_test.dart
rename to tests/language_2/generic/native_test.dart
diff --git a/tests/language_2/generic_no_such_method_dispatcher_test.dart b/tests/language_2/generic/no_such_method_dispatcher_test.dart
similarity index 100%
rename from tests/language_2/generic_no_such_method_dispatcher_test.dart
rename to tests/language_2/generic/no_such_method_dispatcher_test.dart
diff --git a/tests/language_2/generic_object_type_test.dart b/tests/language_2/generic/object_type_test.dart
similarity index 100%
rename from tests/language_2/generic_object_type_test.dart
rename to tests/language_2/generic/object_type_test.dart
diff --git a/tests/language_2/generic_parameterized_extends_test.dart b/tests/language_2/generic/parameterized_extends_test.dart
similarity index 100%
rename from tests/language_2/generic_parameterized_extends_test.dart
rename to tests/language_2/generic/parameterized_extends_test.dart
diff --git a/tests/language_2/recursive_generic_test.dart b/tests/language_2/generic/recursive_generic_test.dart
similarity index 100%
rename from tests/language_2/recursive_generic_test.dart
rename to tests/language_2/generic/recursive_generic_test.dart
diff --git a/tests/language_2/reify_typevar_static_runtime_1_test.dart b/tests/language_2/generic/reify_typevar_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/reify_typevar_static_runtime_1_test.dart
rename to tests/language_2/generic/reify_typevar_runtime_1_test.dart
diff --git a/tests/language_2/reify_typevar_static_runtime_2_test.dart b/tests/language_2/generic/reify_typevar_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/reify_typevar_static_runtime_2_test.dart
rename to tests/language_2/generic/reify_typevar_runtime_2_test.dart
diff --git a/tests/language_2/reify_typevar_static_runtime_3_test.dart b/tests/language_2/generic/reify_typevar_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/reify_typevar_static_runtime_3_test.dart
rename to tests/language_2/generic/reify_typevar_runtime_3_test.dart
diff --git a/tests/language_2/reify_typevar_static_runtime_test.dart b/tests/language_2/generic/reify_typevar_runtime_test.dart
similarity index 100%
rename from tests/language_2/reify_typevar_static_runtime_test.dart
rename to tests/language_2/generic/reify_typevar_runtime_test.dart
diff --git a/tests/language_2/reify_typevar_static_test.dart b/tests/language_2/generic/reify_typevar_static_test.dart
similarity index 100%
rename from tests/language_2/reify_typevar_static_test.dart
rename to tests/language_2/generic/reify_typevar_static_test.dart
diff --git a/tests/language_2/generic_self_reference_test.dart b/tests/language_2/generic/self_reference_test.dart
similarity index 100%
rename from tests/language_2/generic_self_reference_test.dart
rename to tests/language_2/generic/self_reference_test.dart
diff --git a/tests/language_2/generic_sends_test.dart b/tests/language_2/generic/sends_test.dart
similarity index 100%
rename from tests/language_2/generic_sends_test.dart
rename to tests/language_2/generic/sends_test.dart
diff --git a/tests/language_2/generic_sync_star_test.dart b/tests/language_2/generic/sync_star_test.dart
similarity index 100%
rename from tests/language_2/generic_sync_star_test.dart
rename to tests/language_2/generic/sync_star_test.dart
diff --git a/tests/language_2/generic_syntax_test.dart b/tests/language_2/generic/syntax_test.dart
similarity index 100%
rename from tests/language_2/generic_syntax_test.dart
rename to tests/language_2/generic/syntax_test.dart
diff --git a/tests/language_2/generic_tearoff_test.dart b/tests/language_2/generic/tearoff_test.dart
similarity index 100%
rename from tests/language_2/generic_tearoff_test.dart
rename to tests/language_2/generic/tearoff_test.dart
diff --git a/tests/language_2/type_argument_in_super_type_test.dart b/tests/language_2/generic/type_argument_in_super_type_test.dart
similarity index 100%
rename from tests/language_2/type_argument_in_super_type_test.dart
rename to tests/language_2/generic/type_argument_in_super_type_test.dart
diff --git a/tests/language_2/type_argument_substitution_test.dart b/tests/language_2/generic/type_argument_substitution_test.dart
similarity index 100%
rename from tests/language_2/type_argument_substitution_test.dart
rename to tests/language_2/generic/type_argument_substitution_test.dart
diff --git a/tests/language_2/type_parameter_literal_test.dart b/tests/language_2/generic/type_parameter_literal_test.dart
similarity index 100%
rename from tests/language_2/type_parameter_literal_test.dart
rename to tests/language_2/generic/type_parameter_literal_test.dart
diff --git a/tests/language_2/type_parameter_test.dart b/tests/language_2/generic/type_parameter_test.dart
similarity index 100%
rename from tests/language_2/type_parameter_test.dart
rename to tests/language_2/generic/type_parameter_test.dart
diff --git a/tests/language_2/generic_typedef_test.dart b/tests/language_2/generic/typedef_test.dart
similarity index 100%
rename from tests/language_2/generic_typedef_test.dart
rename to tests/language_2/generic/typedef_test.dart
diff --git a/tests/language_2/wrong_number_type_arguments_runtime_test.dart b/tests/language_2/generic/wrong_number_type_arguments_runtime_test.dart
similarity index 100%
rename from tests/language_2/wrong_number_type_arguments_runtime_test.dart
rename to tests/language_2/generic/wrong_number_type_arguments_runtime_test.dart
diff --git a/tests/language_2/wrong_number_type_arguments_test.dart b/tests/language_2/generic/wrong_number_type_arguments_test.dart
similarity index 100%
rename from tests/language_2/wrong_number_type_arguments_test.dart
rename to tests/language_2/generic/wrong_number_type_arguments_test.dart
diff --git a/tests/language_2/generic_methods_bounds_test.dart b/tests/language_2/generic_methods/bounds_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_bounds_test.dart
rename to tests/language_2/generic_methods/bounds_test.dart
diff --git a/tests/language_2/generic_methods_closure_test.dart b/tests/language_2/generic_methods/closure_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_closure_test.dart
rename to tests/language_2/generic_methods/closure_test.dart
diff --git a/tests/language_2/generic_methods_dynamic_test.dart b/tests/language_2/generic_methods/dynamic_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_dynamic_test.dart
rename to tests/language_2/generic_methods/dynamic_test.dart
diff --git a/tests/language_2/generic_methods_function_type_test.dart b/tests/language_2/generic_methods/function_type_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_function_type_test.dart
rename to tests/language_2/generic_methods/function_type_test.dart
diff --git a/tests/language_2/generic_methods_generic_class_tearoff_test.dart b/tests/language_2/generic_methods/generic_class_tearoff_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_generic_class_tearoff_test.dart
rename to tests/language_2/generic_methods/generic_class_tearoff_test.dart
diff --git a/tests/language_2/generic_methods_generic_function_parameter_test.dart b/tests/language_2/generic_methods/generic_function_parameter_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_generic_function_parameter_test.dart
rename to tests/language_2/generic_methods/generic_function_parameter_test.dart
diff --git a/tests/language_2/generic_methods_generic_function_result_runtime_test.dart b/tests/language_2/generic_methods/generic_function_result_runtime_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_generic_function_result_runtime_test.dart
rename to tests/language_2/generic_methods/generic_function_result_runtime_test.dart
diff --git a/tests/language_2/generic_methods_generic_function_result_test.dart b/tests/language_2/generic_methods/generic_function_result_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_generic_function_result_test.dart
rename to tests/language_2/generic_methods/generic_function_result_test.dart
diff --git a/tests/language_2/generic_methods_test.dart b/tests/language_2/generic_methods/generic_methods_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_test.dart
rename to tests/language_2/generic_methods/generic_methods_test.dart
diff --git a/tests/language_2/generic_methods_local_variable_declaration_test.dart b/tests/language_2/generic_methods/local_variable_declaration_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_local_variable_declaration_test.dart
rename to tests/language_2/generic_methods/local_variable_declaration_test.dart
diff --git a/tests/language_2/generic_methods_named_parameters_test.dart b/tests/language_2/generic_methods/named_parameters_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_named_parameters_test.dart
rename to tests/language_2/generic_methods/named_parameters_test.dart
diff --git a/tests/language_2/generic_methods_new_test.dart b/tests/language_2/generic_methods/new_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_new_test.dart
rename to tests/language_2/generic_methods/new_test.dart
diff --git a/tests/language_2/generic_methods_optional_parameters_test.dart b/tests/language_2/generic_methods/optional_parameters_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_optional_parameters_test.dart
rename to tests/language_2/generic_methods/optional_parameters_test.dart
diff --git a/tests/language_2/generic_methods_overriding_test.dart b/tests/language_2/generic_methods/overriding_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_overriding_test.dart
rename to tests/language_2/generic_methods/overriding_test.dart
diff --git a/tests/language_2/generic_methods_recursive_bound_test.dart b/tests/language_2/generic_methods/recursive_bound_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_recursive_bound_test.dart
rename to tests/language_2/generic_methods/recursive_bound_test.dart
diff --git a/tests/language_2/generic_methods_reuse_type_variables_test.dart b/tests/language_2/generic_methods/reuse_type_variables_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_reuse_type_variables_test.dart
rename to tests/language_2/generic_methods/reuse_type_variables_test.dart
diff --git a/tests/language_2/generic_methods_shadowing_test.dart b/tests/language_2/generic_methods/shadowing_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_shadowing_test.dart
rename to tests/language_2/generic_methods/shadowing_test.dart
diff --git a/tests/language_2/generic_methods_simple_as_expression_test.dart b/tests/language_2/generic_methods/simple_as_expression_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_simple_as_expression_test.dart
rename to tests/language_2/generic_methods/simple_as_expression_test.dart
diff --git a/tests/language_2/generic_methods_simple_is_expression_test.dart b/tests/language_2/generic_methods/simple_is_expression_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_simple_is_expression_test.dart
rename to tests/language_2/generic_methods/simple_is_expression_test.dart
diff --git a/tests/language_2/generic_methods_tearoff_specialization_test.dart b/tests/language_2/generic_methods/tearoff_specialization_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_tearoff_specialization_test.dart
rename to tests/language_2/generic_methods/tearoff_specialization_test.dart
diff --git a/tests/language_2/generic_methods_type_expression_test.dart b/tests/language_2/generic_methods/type_expression_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_type_expression_test.dart
rename to tests/language_2/generic_methods/type_expression_test.dart
diff --git a/tests/language_2/generic_methods_unused_parameter_test.dart b/tests/language_2/generic_methods/unused_parameter_test.dart
similarity index 100%
rename from tests/language_2/generic_methods_unused_parameter_test.dart
rename to tests/language_2/generic_methods/unused_parameter_test.dart
diff --git a/tests/language_2/getter_closure_execution_order_test.dart b/tests/language_2/getter/closure_execution_order_test.dart
similarity index 100%
rename from tests/language_2/getter_closure_execution_order_test.dart
rename to tests/language_2/getter/closure_execution_order_test.dart
diff --git a/tests/language_2/getter_declaration_test.dart b/tests/language_2/getter/declaration_test.dart
similarity index 100%
rename from tests/language_2/getter_declaration_test.dart
rename to tests/language_2/getter/declaration_test.dart
diff --git a/tests/language_2/getter_no_setter2_runtime_test.dart b/tests/language_2/getter/no_setter2_runtime_test.dart
similarity index 100%
rename from tests/language_2/getter_no_setter2_runtime_test.dart
rename to tests/language_2/getter/no_setter2_runtime_test.dart
diff --git a/tests/language_2/getter_no_setter2_test.dart b/tests/language_2/getter/no_setter2_test.dart
similarity index 100%
rename from tests/language_2/getter_no_setter2_test.dart
rename to tests/language_2/getter/no_setter2_test.dart
diff --git a/tests/language_2/getter_no_setter_runtime_test.dart b/tests/language_2/getter/no_setter_runtime_test.dart
similarity index 100%
rename from tests/language_2/getter_no_setter_runtime_test.dart
rename to tests/language_2/getter/no_setter_runtime_test.dart
diff --git a/tests/language_2/getter_no_setter_test.dart b/tests/language_2/getter/no_setter_test.dart
similarity index 100%
rename from tests/language_2/getter_no_setter_test.dart
rename to tests/language_2/getter/no_setter_test.dart
diff --git a/tests/language_2/getter_override2_test.dart b/tests/language_2/getter/override2_test.dart
similarity index 100%
rename from tests/language_2/getter_override2_test.dart
rename to tests/language_2/getter/override2_test.dart
diff --git a/tests/language_2/getter_override3_test.dart b/tests/language_2/getter/override3_test.dart
similarity index 100%
rename from tests/language_2/getter_override3_test.dart
rename to tests/language_2/getter/override3_test.dart
diff --git a/tests/language_2/getter_override_test.dart b/tests/language_2/getter/override_test.dart
similarity index 100%
rename from tests/language_2/getter_override_test.dart
rename to tests/language_2/getter/override_test.dart
diff --git a/tests/language_2/getter_parameters_runtime_test.dart b/tests/language_2/getter/parameters_runtime_test.dart
similarity index 100%
rename from tests/language_2/getter_parameters_runtime_test.dart
rename to tests/language_2/getter/parameters_runtime_test.dart
diff --git a/tests/language_2/getter_parameters_test.dart b/tests/language_2/getter/parameters_test.dart
similarity index 100%
rename from tests/language_2/getter_parameters_test.dart
rename to tests/language_2/getter/parameters_test.dart
diff --git a/tests/language_2/getters_setters2_runtime_test.dart b/tests/language_2/getter/setter2_runtime_test.dart
similarity index 100%
rename from tests/language_2/getters_setters2_runtime_test.dart
rename to tests/language_2/getter/setter2_runtime_test.dart
diff --git a/tests/language_2/getters_setters2_test.dart b/tests/language_2/getter/setter2_test.dart
similarity index 100%
rename from tests/language_2/getters_setters2_test.dart
rename to tests/language_2/getter/setter2_test.dart
diff --git a/tests/language_2/getters_setters_test.dart b/tests/language_2/getter/setter_getters_setters_test.dart
similarity index 100%
rename from tests/language_2/getters_setters_test.dart
rename to tests/language_2/getter/setter_getters_setters_test.dart
diff --git a/tests/language_2/getter_setter_in_lib.dart b/tests/language_2/getter/setter_in_lib.dart
similarity index 100%
rename from tests/language_2/getter_setter_in_lib.dart
rename to tests/language_2/getter/setter_in_lib.dart
diff --git a/tests/language_2/getter_setter_in_lib2.dart b/tests/language_2/getter/setter_in_lib2.dart
similarity index 100%
rename from tests/language_2/getter_setter_in_lib2.dart
rename to tests/language_2/getter/setter_in_lib2.dart
diff --git a/tests/language_2/getter_setter_in_lib3.dart b/tests/language_2/getter/setter_in_lib3.dart
similarity index 100%
rename from tests/language_2/getter_setter_in_lib3.dart
rename to tests/language_2/getter/setter_in_lib3.dart
diff --git a/tests/language_2/getter_setter_in_lib_test.dart b/tests/language_2/getter/setter_in_lib_test.dart
similarity index 81%
rename from tests/language_2/getter_setter_in_lib_test.dart
rename to tests/language_2/getter/setter_in_lib_test.dart
index 0e247921b08..f9803e0bc9a 100644
--- a/tests/language_2/getter_setter_in_lib_test.dart
+++ b/tests/language_2/getter/setter_in_lib_test.dart
@@ -5,9 +5,9 @@
 library GetterSetterInLibTest;
 
 import "package:expect/expect.dart";
-import 'getter_setter_in_lib.dart';
-import 'getter_setter_in_lib2.dart';
-import 'getter_setter_in_lib3.dart' as L3;
+import 'setter_in_lib.dart';
+import 'setter_in_lib2.dart';
+import 'setter_in_lib3.dart' as L3;
 
 main() {
   Expect.equals(42, foo);
diff --git a/tests/language_2/getter_setter_interceptor_test.dart b/tests/language_2/getter/setter_interceptor_test.dart
similarity index 100%
rename from tests/language_2/getter_setter_interceptor_test.dart
rename to tests/language_2/getter/setter_interceptor_test.dart
diff --git a/tests/language_2/getter_setter_order_test.dart b/tests/language_2/getter/setter_order_test.dart
similarity index 100%
rename from tests/language_2/getter_setter_order_test.dart
rename to tests/language_2/getter/setter_order_test.dart
diff --git a/tests/language_2/getters_setters_type2_test.dart b/tests/language_2/getter/setter_type2_test.dart
similarity index 100%
rename from tests/language_2/getters_setters_type2_test.dart
rename to tests/language_2/getter/setter_type2_test.dart
diff --git a/tests/language_2/getters_setters_type3_test.dart b/tests/language_2/getter/setter_type3_test.dart
similarity index 100%
rename from tests/language_2/getters_setters_type3_test.dart
rename to tests/language_2/getter/setter_type3_test.dart
diff --git a/tests/language_2/getters_setters_type_runtime_test.dart b/tests/language_2/getter/setter_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/getters_setters_type_runtime_test.dart
rename to tests/language_2/getter/setter_type_runtime_test.dart
diff --git a/tests/language_2/getters_setters_type_test.dart b/tests/language_2/getter/setter_type_test.dart
similarity index 100%
rename from tests/language_2/getters_setters_type_test.dart
rename to tests/language_2/getter/setter_type_test.dart
diff --git a/tests/language_2/get_set_syntax_test.dart b/tests/language_2/getter/syntax_get_set_syntax_test.dart
similarity index 100%
rename from tests/language_2/get_set_syntax_test.dart
rename to tests/language_2/getter/syntax_get_set_syntax_test.dart
diff --git a/tests/language_2/get_set_syntax_runtime_1_test.dart b/tests/language_2/getter/syntax_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/get_set_syntax_runtime_1_test.dart
rename to tests/language_2/getter/syntax_runtime_1_test.dart
diff --git a/tests/language_2/get_set_syntax_runtime_test.dart b/tests/language_2/getter/syntax_runtime_test.dart
similarity index 100%
rename from tests/language_2/get_set_syntax_runtime_test.dart
rename to tests/language_2/getter/syntax_runtime_test.dart
diff --git a/tests/language_2/unbound_getter_test.dart b/tests/language_2/getter/unbound_test.dart
similarity index 100%
rename from tests/language_2/unbound_getter_test.dart
rename to tests/language_2/getter/unbound_test.dart
diff --git a/tests/language_2/built_in_identifier_test.dart b/tests/language_2/identifier/built_in_identifier_test.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_test.dart
rename to tests/language_2/identifier/built_in_identifier_test.dart
diff --git a/tests/language_2/built_in_identifier_illegal_runtime_test.dart b/tests/language_2/identifier/built_in_illegal_runtime_test.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_illegal_runtime_test.dart
rename to tests/language_2/identifier/built_in_illegal_runtime_test.dart
diff --git a/tests/language_2/built_in_identifier_illegal_test.dart b/tests/language_2/identifier/built_in_illegal_test.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_illegal_test.dart
rename to tests/language_2/identifier/built_in_illegal_test.dart
diff --git a/tests/language_2/built_in_identifier_not_prefix_test.dart b/tests/language_2/identifier/built_in_not_prefix_test.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_not_prefix_test.dart
rename to tests/language_2/identifier/built_in_not_prefix_test.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_async.dart b/tests/language_2/identifier/built_in_prefix_library_async.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_async.dart
rename to tests/language_2/identifier/built_in_prefix_library_async.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_await.dart b/tests/language_2/identifier/built_in_prefix_library_await.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_await.dart
rename to tests/language_2/identifier/built_in_prefix_library_await.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_hide.dart b/tests/language_2/identifier/built_in_prefix_library_hide.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_hide.dart
rename to tests/language_2/identifier/built_in_prefix_library_hide.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_library.dart b/tests/language_2/identifier/built_in_prefix_library_library.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_library.dart
rename to tests/language_2/identifier/built_in_prefix_library_library.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_of.dart b/tests/language_2/identifier/built_in_prefix_library_of.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_of.dart
rename to tests/language_2/identifier/built_in_prefix_library_of.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_on.dart b/tests/language_2/identifier/built_in_prefix_library_on.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_on.dart
rename to tests/language_2/identifier/built_in_prefix_library_on.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_show.dart b/tests/language_2/identifier/built_in_prefix_library_show.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_show.dart
rename to tests/language_2/identifier/built_in_prefix_library_show.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_sync.dart b/tests/language_2/identifier/built_in_prefix_library_sync.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_sync.dart
rename to tests/language_2/identifier/built_in_prefix_library_sync.dart
diff --git a/tests/language_2/built_in_identifier_prefix_library_yield.dart b/tests/language_2/identifier/built_in_prefix_library_yield.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_prefix_library_yield.dart
rename to tests/language_2/identifier/built_in_prefix_library_yield.dart
diff --git a/tests/language_2/built_in_identifier_type_annotation_test.dart b/tests/language_2/identifier/built_in_type_annotation_test.dart
similarity index 100%
rename from tests/language_2/built_in_identifier_type_annotation_test.dart
rename to tests/language_2/identifier/built_in_type_annotation_test.dart
diff --git a/tests/language_2/known_identifier_prefix_error_runtime_test.dart b/tests/language_2/identifier/known_prefix_error_runtime_test.dart
similarity index 65%
rename from tests/language_2/known_identifier_prefix_error_runtime_test.dart
rename to tests/language_2/identifier/known_prefix_error_runtime_test.dart
index b11ea63448f..2d4a40cc627 100644
--- a/tests/language_2/known_identifier_prefix_error_runtime_test.dart
+++ b/tests/language_2/identifier/known_prefix_error_runtime_test.dart
@@ -15,14 +15,14 @@
 // identifiers: `async`, `await`, `hide`, `of`, `on`, `show`, `sync`, `yield`.
 
 import "package:expect/expect.dart";
-import 'built_in_identifier_prefix_library_async.dart' as async;
-import 'built_in_identifier_prefix_library_await.dart' as await;
-import 'built_in_identifier_prefix_library_hide.dart' as hide;
-import 'built_in_identifier_prefix_library_of.dart' as of;
-import 'built_in_identifier_prefix_library_on.dart' as on;
-import 'built_in_identifier_prefix_library_show.dart' as show;
-import 'built_in_identifier_prefix_library_sync.dart' as sync;
-import 'built_in_identifier_prefix_library_yield.dart' as yield;
+import 'built_in_prefix_library_async.dart' as async;
+import 'built_in_prefix_library_await.dart' as await;
+import 'built_in_prefix_library_hide.dart' as hide;
+import 'built_in_prefix_library_of.dart' as of;
+import 'built_in_prefix_library_on.dart' as on;
+import 'built_in_prefix_library_show.dart' as show;
+import 'built_in_prefix_library_sync.dart' as sync;
+import 'built_in_prefix_library_yield.dart' as yield;
 
 
 
diff --git a/tests/language_2/known_identifier_prefix_error_test.dart b/tests/language_2/identifier/known_prefix_error_test.dart
similarity index 92%
rename from tests/language_2/known_identifier_prefix_error_test.dart
rename to tests/language_2/identifier/known_prefix_error_test.dart
index 983b57b1ee7..a104b533e87 100644
--- a/tests/language_2/known_identifier_prefix_error_test.dart
+++ b/tests/language_2/identifier/known_prefix_error_test.dart
@@ -12,14 +12,14 @@
 // identifiers: `async`, `await`, `hide`, `of`, `on`, `show`, `sync`, `yield`.
 
 import "package:expect/expect.dart";
-import 'built_in_identifier_prefix_library_async.dart' as async;
-import 'built_in_identifier_prefix_library_await.dart' as await;
-import 'built_in_identifier_prefix_library_hide.dart' as hide;
-import 'built_in_identifier_prefix_library_of.dart' as of;
-import 'built_in_identifier_prefix_library_on.dart' as on;
-import 'built_in_identifier_prefix_library_show.dart' as show;
-import 'built_in_identifier_prefix_library_sync.dart' as sync;
-import 'built_in_identifier_prefix_library_yield.dart' as yield;
+import 'built_in_prefix_library_async.dart' as async;
+import 'built_in_prefix_library_await.dart' as await;
+import 'built_in_prefix_library_hide.dart' as hide;
+import 'built_in_prefix_library_of.dart' as of;
+import 'built_in_prefix_library_on.dart' as on;
+import 'built_in_prefix_library_show.dart' as show;
+import 'built_in_prefix_library_sync.dart' as sync;
+import 'built_in_prefix_library_yield.dart' as yield;
 
 async<dynamic> _async = new async.A();
 // [error line 24, column 1, length 5]
diff --git a/tests/language_2/known_identifier_prefix_test.dart b/tests/language_2/identifier/known_prefix_test.dart
similarity index 82%
rename from tests/language_2/known_identifier_prefix_test.dart
rename to tests/language_2/identifier/known_prefix_test.dart
index 2768a3b36d4..9caf67bccf8 100644
--- a/tests/language_2/known_identifier_prefix_test.dart
+++ b/tests/language_2/identifier/known_prefix_test.dart
@@ -9,14 +9,14 @@
 //   `async`, `await`, `hide`, `of`, `on`, `show`, `sync`, `yield`.
 
 import "package:expect/expect.dart";
-import 'built_in_identifier_prefix_library_async.dart' as async;
-import 'built_in_identifier_prefix_library_await.dart' as await;
-import 'built_in_identifier_prefix_library_hide.dart' as hide;
-import 'built_in_identifier_prefix_library_of.dart' as of;
-import 'built_in_identifier_prefix_library_on.dart' as on;
-import 'built_in_identifier_prefix_library_show.dart' as show;
-import 'built_in_identifier_prefix_library_sync.dart' as sync;
-import 'built_in_identifier_prefix_library_yield.dart' as yield;
+import 'built_in_prefix_library_async.dart' as async;
+import 'built_in_prefix_library_await.dart' as await;
+import 'built_in_prefix_library_hide.dart' as hide;
+import 'built_in_prefix_library_of.dart' as of;
+import 'built_in_prefix_library_on.dart' as on;
+import 'built_in_prefix_library_show.dart' as show;
+import 'built_in_prefix_library_sync.dart' as sync;
+import 'built_in_prefix_library_yield.dart' as yield;
 
 async.A _async = new async.A();
 await.A _await = new await.A();
diff --git a/tests/language_2/known_identifier_usage_error_runtime_test.dart b/tests/language_2/identifier/known_usage_error_runtime_test.dart
similarity index 100%
rename from tests/language_2/known_identifier_usage_error_runtime_test.dart
rename to tests/language_2/identifier/known_usage_error_runtime_test.dart
diff --git a/tests/language_2/known_identifier_usage_error_test.dart b/tests/language_2/identifier/known_usage_error_test.dart
similarity index 100%
rename from tests/language_2/known_identifier_usage_error_test.dart
rename to tests/language_2/identifier/known_usage_error_test.dart
diff --git a/tests/language_2/known_identifier_usage_test.dart b/tests/language_2/identifier/known_usage_test.dart
similarity index 100%
rename from tests/language_2/known_identifier_usage_test.dart
rename to tests/language_2/identifier/known_usage_test.dart
diff --git a/tests/language_2/naming2_test.dart b/tests/language_2/identifier/naming2_test.dart
similarity index 100%
rename from tests/language_2/naming2_test.dart
rename to tests/language_2/identifier/naming2_test.dart
diff --git a/tests/language_2/naming3_test.dart b/tests/language_2/identifier/naming3_test.dart
similarity index 100%
rename from tests/language_2/naming3_test.dart
rename to tests/language_2/identifier/naming3_test.dart
diff --git a/tests/language_2/naming_test.dart b/tests/language_2/identifier/naming_test.dart
similarity index 100%
rename from tests/language_2/naming_test.dart
rename to tests/language_2/identifier/naming_test.dart
diff --git a/tests/language_2/identical_closure2_test.dart b/tests/language_2/identity/closure2_test.dart
similarity index 100%
rename from tests/language_2/identical_closure2_test.dart
rename to tests/language_2/identity/closure2_test.dart
diff --git a/tests/language_2/identical_closure_test.dart b/tests/language_2/identity/closure_test.dart
similarity index 100%
rename from tests/language_2/identical_closure_test.dart
rename to tests/language_2/identity/closure_test.dart
diff --git a/tests/language_2/identical_const_test.dart b/tests/language_2/identity/const_test.dart
similarity index 100%
rename from tests/language_2/identical_const_test.dart
rename to tests/language_2/identity/const_test.dart
diff --git a/tests/language_2/identical_test.dart b/tests/language_2/identity/identical_test.dart
similarity index 100%
rename from tests/language_2/identical_test.dart
rename to tests/language_2/identity/identical_test.dart
diff --git a/tests/language_2/mint_identical_test.dart b/tests/language_2/identity/mint_identical_test.dart
similarity index 100%
rename from tests/language_2/mint_identical_test.dart
rename to tests/language_2/identity/mint_identical_test.dart
diff --git a/tests/language_2/nan_identical_test.dart b/tests/language_2/identity/nan_identical_test.dart
similarity index 100%
rename from tests/language_2/nan_identical_test.dart
rename to tests/language_2/identity/nan_identical_test.dart
diff --git a/tests/language_2/strict_equal_test.dart b/tests/language_2/identity/strict_equal_test.dart
similarity index 100%
rename from tests/language_2/strict_equal_test.dart
rename to tests/language_2/identity/strict_equal_test.dart
diff --git a/tests/language_2/if_and_test.dart b/tests/language_2/if/and_test.dart
similarity index 100%
rename from tests/language_2/if_and_test.dart
rename to tests/language_2/if/and_test.dart
diff --git a/tests/language_2/dangling_else_test.dart b/tests/language_2/if/dangling_else_test.dart
similarity index 100%
rename from tests/language_2/dangling_else_test.dart
rename to tests/language_2/if/dangling_else_test.dart
diff --git a/tests/language_2/if_test.dart b/tests/language_2/if/if_test.dart
similarity index 100%
rename from tests/language_2/if_test.dart
rename to tests/language_2/if/if_test.dart
diff --git a/tests/language_2/nested_if_test.dart b/tests/language_2/if/nested_if_test.dart
similarity index 100%
rename from tests/language_2/nested_if_test.dart
rename to tests/language_2/if/nested_if_test.dart
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_10_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_10_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_10_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_10_test.dart
index 73277de2922..6fba05c6e07 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_10_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_10_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_13_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_13_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_13_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_13_test.dart
index 2a29ecb6921..e1685816891 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_13_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_13_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_14_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_14_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_14_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_14_test.dart
index fcd0d7b07e4..17a5c90214c 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_14_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_14_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_15_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_15_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_15_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_15_test.dart
index 857d10b7a4c..9310956e142 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_15_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_15_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_16_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_16_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_16_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_16_test.dart
index 89813b42ccd..8781d7a4254 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_16_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_16_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_17_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_17_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_17_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_17_test.dart
index 058b00ab2f8..55c4fbebf8e 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_17_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_17_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_18_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_18_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_18_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_18_test.dart
index 2c2d1aa7aff..190aeb0c8be 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_18_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_18_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_19_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_19_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_19_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_19_test.dart
index 8d38436c1d4..0aa639409bd 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_19_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_19_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_1_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_1_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_1_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_1_test.dart
index cfe118f0989..8c461f7d443 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_1_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_1_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_20_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_20_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_20_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_20_test.dart
index 07a925302d6..a76471b9475 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_20_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_20_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_21_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_21_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_21_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_21_test.dart
index 83e0863bd03..88129e0b94a 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_21_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_21_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_22_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_22_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_22_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_22_test.dart
index c58faef8888..3b09af8be61 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_22_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_22_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_23_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_23_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_23_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_23_test.dart
index 5f470ebd38f..eeae2ecd69a 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_23_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_23_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_24_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_24_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_24_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_24_test.dart
index b74ceb97e86..21b0594e512 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_24_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_24_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_25_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_25_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_25_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_25_test.dart
index 467ea0be26f..e323f4dc2c8 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_25_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_25_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_26_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_26_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_26_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_26_test.dart
index 6a9b7101d4e..afd709b8c0c 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_26_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_26_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_27_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_27_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_27_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_27_test.dart
index 1e213d69d24..97fa09c082d 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_27_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_27_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_2_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_2_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_2_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_2_test.dart
index 82a8bb1a2bf..24750fa340e 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_2_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_2_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_3_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_3_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_3_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_3_test.dart
index 49eaa803be1..bca92f80932 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_3_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_3_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_4_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_4_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_4_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_4_test.dart
index d6346f88ec8..027437fd6aa 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_4_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_4_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_5_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_5_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_5_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_5_test.dart
index 184aa2004e0..534bffd734f 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_5_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_5_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_6_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_6_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_6_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_6_test.dart
index b0381c2e9d6..fbe170b2458 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_6_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_6_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_7_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_7_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_7_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_7_test.dart
index 4a709bddcbe..8009cf4ae1b 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_7_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_7_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_8_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_8_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_8_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_8_test.dart
index 0a176ac7dfa..739db83cbec 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_8_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_8_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_9_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_9_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_9_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_9_test.dart
index 4ced6da8d92..3acef402237 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_9_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_9_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_runtime_test.dart b/tests/language_2/if_null/assignment_behavior_runtime_test.dart
similarity index 98%
rename from tests/language_2/if_null_assignment_behavior_runtime_test.dart
rename to tests/language_2/if_null/assignment_behavior_runtime_test.dart
index dc0ce1facff..4ef49b06648 100644
--- a/tests/language_2/if_null_assignment_behavior_runtime_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_runtime_test.dart
@@ -9,7 +9,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_behavior_test.dart b/tests/language_2/if_null/assignment_behavior_test.dart
similarity index 99%
rename from tests/language_2/if_null_assignment_behavior_test.dart
rename to tests/language_2/if_null/assignment_behavior_test.dart
index 6fee756cff7..0cd4e679e9e 100644
--- a/tests/language_2/if_null_assignment_behavior_test.dart
+++ b/tests/language_2/if_null/assignment_behavior_test.dart
@@ -6,7 +6,7 @@
 // keeping track of the operations performed.
 
 import "package:expect/expect.dart";
-import "if_null_assignment_helper.dart" as h;
+import "assignment_helper.dart" as h;
 
 bad() {
   Expect.fail('Should not be executed');
diff --git a/tests/language_2/if_null_assignment_helper.dart b/tests/language_2/if_null/assignment_helper.dart
similarity index 100%
rename from tests/language_2/if_null_assignment_helper.dart
rename to tests/language_2/if_null/assignment_helper.dart
diff --git a/tests/language_2/if_null_assignment_static_test.dart b/tests/language_2/if_null/assignment_static_test.dart
similarity index 100%
rename from tests/language_2/if_null_assignment_static_test.dart
rename to tests/language_2/if_null/assignment_static_test.dart
diff --git a/tests/language_2/if_null_behavior_test.dart b/tests/language_2/if_null/behavior_test.dart
similarity index 100%
rename from tests/language_2/if_null_behavior_test.dart
rename to tests/language_2/if_null/behavior_test.dart
diff --git a/tests/language_2/if_null_evaluation_order_test.dart b/tests/language_2/if_null/evaluation_order_test.dart
similarity index 100%
rename from tests/language_2/if_null_evaluation_order_test.dart
rename to tests/language_2/if_null/evaluation_order_test.dart
diff --git a/tests/language_2/if_null_precedence_runtime_test.dart b/tests/language_2/if_null/precedence_runtime_test.dart
similarity index 100%
rename from tests/language_2/if_null_precedence_runtime_test.dart
rename to tests/language_2/if_null/precedence_runtime_test.dart
diff --git a/tests/language_2/if_null_precedence_test.dart b/tests/language_2/if_null/precedence_test.dart
similarity index 100%
rename from tests/language_2/if_null_precedence_test.dart
rename to tests/language_2/if_null/precedence_test.dart
diff --git a/tests/language_2/implicit_downcast_during_assert_initializer_test.dart b/tests/language_2/implicit_downcast_during/assert_initializer_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_assert_initializer_test.dart
rename to tests/language_2/implicit_downcast_during/assert_initializer_test.dart
diff --git a/tests/language_2/implicit_downcast_during_assert_statement_test.dart b/tests/language_2/implicit_downcast_during/assert_statement_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_assert_statement_test.dart
rename to tests/language_2/implicit_downcast_during/assert_statement_test.dart
diff --git a/tests/language_2/implicit_downcast_during_assignment_test.dart b/tests/language_2/implicit_downcast_during/assignment_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_assignment_test.dart
rename to tests/language_2/implicit_downcast_during/assignment_test.dart
diff --git a/tests/language_2/implicit_downcast_during_combiner_test.dart b/tests/language_2/implicit_downcast_during/combiner_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_combiner_test.dart
rename to tests/language_2/implicit_downcast_during/combiner_test.dart
diff --git a/tests/language_2/implicit_downcast_during_compound_assignment_test.dart b/tests/language_2/implicit_downcast_during/compound_assignment_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_compound_assignment_test.dart
rename to tests/language_2/implicit_downcast_during/compound_assignment_test.dart
diff --git a/tests/language_2/implicit_downcast_during_conditional_expression_test.dart b/tests/language_2/implicit_downcast_during/conditional_expression_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_conditional_expression_test.dart
rename to tests/language_2/implicit_downcast_during/conditional_expression_test.dart
diff --git a/tests/language_2/implicit_downcast_during_constructor_initializer_test.dart b/tests/language_2/implicit_downcast_during/constructor_initializer_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_constructor_initializer_test.dart
rename to tests/language_2/implicit_downcast_during/constructor_initializer_test.dart
diff --git a/tests/language_2/implicit_downcast_during_constructor_invocation_test.dart b/tests/language_2/implicit_downcast_during/constructor_invocation_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_constructor_invocation_test.dart
rename to tests/language_2/implicit_downcast_during/constructor_invocation_test.dart
diff --git a/tests/language_2/implicit_downcast_during_do_test.dart b/tests/language_2/implicit_downcast_during/do_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_do_test.dart
rename to tests/language_2/implicit_downcast_during/do_test.dart
diff --git a/tests/language_2/implicit_downcast_during_factory_constructor_invocation_test.dart b/tests/language_2/implicit_downcast_during/factory_constructor_invocation_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_factory_constructor_invocation_test.dart
rename to tests/language_2/implicit_downcast_during/factory_constructor_invocation_test.dart
diff --git a/tests/language_2/implicit_downcast_during_field_declaration_test.dart b/tests/language_2/implicit_downcast_during/field_declaration_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_field_declaration_test.dart
rename to tests/language_2/implicit_downcast_during/field_declaration_test.dart
diff --git a/tests/language_2/implicit_downcast_during_for_condition_test.dart b/tests/language_2/implicit_downcast_during/for_condition_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_for_condition_test.dart
rename to tests/language_2/implicit_downcast_during/for_condition_test.dart
diff --git a/tests/language_2/implicit_downcast_during_for_in_element_test.dart b/tests/language_2/implicit_downcast_during/for_in_element_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_for_in_element_test.dart
rename to tests/language_2/implicit_downcast_during/for_in_element_test.dart
diff --git a/tests/language_2/implicit_downcast_during_for_in_iterable_test.dart b/tests/language_2/implicit_downcast_during/for_in_iterable_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_for_in_iterable_test.dart
rename to tests/language_2/implicit_downcast_during/for_in_iterable_test.dart
diff --git a/tests/language_2/implicit_downcast_during_for_initializer_expression_test.dart b/tests/language_2/implicit_downcast_during/for_initializer_expression_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_for_initializer_expression_test.dart
rename to tests/language_2/implicit_downcast_during/for_initializer_expression_test.dart
diff --git a/tests/language_2/implicit_downcast_during_for_initializer_var_test.dart b/tests/language_2/implicit_downcast_during/for_initializer_var_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_for_initializer_var_test.dart
rename to tests/language_2/implicit_downcast_during/for_initializer_var_test.dart
diff --git a/tests/language_2/implicit_downcast_during_function_literal_arrow_test.dart b/tests/language_2/implicit_downcast_during/function_literal_arrow_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_function_literal_arrow_test.dart
rename to tests/language_2/implicit_downcast_during/function_literal_arrow_test.dart
diff --git a/tests/language_2/implicit_downcast_during_function_literal_return_test.dart b/tests/language_2/implicit_downcast_during/function_literal_return_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_function_literal_return_test.dart
rename to tests/language_2/implicit_downcast_during/function_literal_return_test.dart
diff --git a/tests/language_2/implicit_downcast_during_if_null_assignment_test.dart b/tests/language_2/implicit_downcast_during/if_null_assignment_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_if_null_assignment_test.dart
rename to tests/language_2/implicit_downcast_during/if_null_assignment_test.dart
diff --git a/tests/language_2/implicit_downcast_during_if_statement_test.dart b/tests/language_2/implicit_downcast_during/if_statement_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_if_statement_test.dart
rename to tests/language_2/implicit_downcast_during/if_statement_test.dart
diff --git a/tests/language_2/implicit_downcast_during_indexed_assignment_test.dart b/tests/language_2/implicit_downcast_during/indexed_assignment_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_indexed_assignment_test.dart
rename to tests/language_2/implicit_downcast_during/indexed_assignment_test.dart
diff --git a/tests/language_2/implicit_downcast_during_indexed_compound_assignment_test.dart b/tests/language_2/implicit_downcast_during/indexed_compound_assignment_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_indexed_compound_assignment_test.dart
rename to tests/language_2/implicit_downcast_during/indexed_compound_assignment_test.dart
diff --git a/tests/language_2/implicit_downcast_during_indexed_get_test.dart b/tests/language_2/implicit_downcast_during/indexed_get_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_indexed_get_test.dart
rename to tests/language_2/implicit_downcast_during/indexed_get_test.dart
diff --git a/tests/language_2/implicit_downcast_during_indexed_if_null_assignment_test.dart b/tests/language_2/implicit_downcast_during/indexed_if_null_assignment_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_indexed_if_null_assignment_test.dart
rename to tests/language_2/implicit_downcast_during/indexed_if_null_assignment_test.dart
diff --git a/tests/language_2/implicit_downcast_during_invocation_test.dart b/tests/language_2/implicit_downcast_during/invocation_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_invocation_test.dart
rename to tests/language_2/implicit_downcast_during/invocation_test.dart
diff --git a/tests/language_2/implicit_downcast_during_list_literal_test.dart b/tests/language_2/implicit_downcast_during/list_literal_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_list_literal_test.dart
rename to tests/language_2/implicit_downcast_during/list_literal_test.dart
diff --git a/tests/language_2/implicit_downcast_during_logical_expression_test.dart b/tests/language_2/implicit_downcast_during/logical_expression_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_logical_expression_test.dart
rename to tests/language_2/implicit_downcast_during/logical_expression_test.dart
diff --git a/tests/language_2/implicit_downcast_during_map_literal_test.dart b/tests/language_2/implicit_downcast_during/map_literal_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_map_literal_test.dart
rename to tests/language_2/implicit_downcast_during/map_literal_test.dart
diff --git a/tests/language_2/implicit_downcast_during_method_invocation_test.dart b/tests/language_2/implicit_downcast_during/method_invocation_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_method_invocation_test.dart
rename to tests/language_2/implicit_downcast_during/method_invocation_test.dart
diff --git a/tests/language_2/implicit_downcast_during_not_test.dart b/tests/language_2/implicit_downcast_during/not_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_not_test.dart
rename to tests/language_2/implicit_downcast_during/not_test.dart
diff --git a/tests/language_2/implicit_downcast_during_null_aware_method_invocation_test.dart b/tests/language_2/implicit_downcast_during/null_aware_method_invocation_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_null_aware_method_invocation_test.dart
rename to tests/language_2/implicit_downcast_during/null_aware_method_invocation_test.dart
diff --git a/tests/language_2/implicit_downcast_during_redirecting_initializer_test.dart b/tests/language_2/implicit_downcast_during/redirecting_initializer_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_redirecting_initializer_test.dart
rename to tests/language_2/implicit_downcast_during/redirecting_initializer_test.dart
diff --git a/tests/language_2/implicit_downcast_during_return_async_test.dart b/tests/language_2/implicit_downcast_during/return_async_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_return_async_test.dart
rename to tests/language_2/implicit_downcast_during/return_async_test.dart
diff --git a/tests/language_2/implicit_downcast_during_return_test.dart b/tests/language_2/implicit_downcast_during/return_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_return_test.dart
rename to tests/language_2/implicit_downcast_during/return_test.dart
diff --git a/tests/language_2/implicit_downcast_during_static_method_invocation_test.dart b/tests/language_2/implicit_downcast_during/static_method_invocation_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_static_method_invocation_test.dart
rename to tests/language_2/implicit_downcast_during/static_method_invocation_test.dart
diff --git a/tests/language_2/implicit_downcast_during_super_initializer_test.dart b/tests/language_2/implicit_downcast_during/super_initializer_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_super_initializer_test.dart
rename to tests/language_2/implicit_downcast_during/super_initializer_test.dart
diff --git a/tests/language_2/implicit_downcast_during_super_method_invocation_test.dart b/tests/language_2/implicit_downcast_during/super_method_invocation_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_super_method_invocation_test.dart
rename to tests/language_2/implicit_downcast_during/super_method_invocation_test.dart
diff --git a/tests/language_2/implicit_downcast_during_variable_declaration_test.dart b/tests/language_2/implicit_downcast_during/variable_declaration_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_variable_declaration_test.dart
rename to tests/language_2/implicit_downcast_during/variable_declaration_test.dart
diff --git a/tests/language_2/implicit_downcast_during_while_statement_test.dart b/tests/language_2/implicit_downcast_during/while_statement_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_while_statement_test.dart
rename to tests/language_2/implicit_downcast_during/while_statement_test.dart
diff --git a/tests/language_2/implicit_downcast_during_yield_star_test.dart b/tests/language_2/implicit_downcast_during/yield_star_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_yield_star_test.dart
rename to tests/language_2/implicit_downcast_during/yield_star_test.dart
diff --git a/tests/language_2/implicit_downcast_during_yield_test.dart b/tests/language_2/implicit_downcast_during/yield_test.dart
similarity index 100%
rename from tests/language_2/implicit_downcast_during_yield_test.dart
rename to tests/language_2/implicit_downcast_during/yield_test.dart
diff --git a/tests/language_2/import_collection_no_prefix_test.dart b/tests/language_2/import/collection_no_prefix_test.dart
similarity index 100%
rename from tests/language_2/import_collection_no_prefix_test.dart
rename to tests/language_2/import/collection_no_prefix_test.dart
diff --git a/tests/language_2/import_combinators2_runtime_test.dart b/tests/language_2/import/combinators2_runtime_test.dart
similarity index 100%
rename from tests/language_2/import_combinators2_runtime_test.dart
rename to tests/language_2/import/combinators2_runtime_test.dart
diff --git a/tests/language_2/import_combinators2_test.dart b/tests/language_2/import/combinators2_test.dart
similarity index 100%
rename from tests/language_2/import_combinators2_test.dart
rename to tests/language_2/import/combinators2_test.dart
diff --git a/tests/language_2/import_combinators_part.dart b/tests/language_2/import/combinators_part.dart
similarity index 100%
rename from tests/language_2/import_combinators_part.dart
rename to tests/language_2/import/combinators_part.dart
diff --git a/tests/language_2/import_combinators_test.dart b/tests/language_2/import/combinators_test.dart
similarity index 96%
rename from tests/language_2/import_combinators_test.dart
rename to tests/language_2/import/combinators_test.dart
index c2757e1986e..c330983ae1e 100644
--- a/tests/language_2/import_combinators_test.dart
+++ b/tests/language_2/import/combinators_test.dart
@@ -11,7 +11,7 @@ import "import1_lib.dart" show hide, show hide ugly;
 import "export1_lib.dart";
 import "dart:math" as M show e;
 
-part "import_combinators_part.dart";
+part "combinators_part.dart";
 
 main() {
   Expect.equals("hide", hide);
diff --git a/tests/language_2/conditional_import_test.dart b/tests/language_2/import/conditional_import_test.dart
similarity index 100%
rename from tests/language_2/conditional_import_test.dart
rename to tests/language_2/import/conditional_import_test.dart
diff --git a/tests/language_2/conditional_import_string_test.dart b/tests/language_2/import/conditional_string_test.dart
similarity index 96%
rename from tests/language_2/conditional_import_string_test.dart
rename to tests/language_2/import/conditional_string_test.dart
index f972c2b0e08..2eafa52e2b8 100644
--- a/tests/language_2/conditional_import_string_test.dart
+++ b/tests/language_2/import/conditional_string_test.dart
@@ -6,7 +6,7 @@ import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 
 // All three libraries have an HttpRequest class.
-import "conditional_import_string_test.dart"
+import "conditional_string_test.dart"
     if (dart.library.io == "true") "dart:io"
     if (dart.library.html == "true") "dart:html" deferred as d show HttpRequest;
 
diff --git a/tests/language_2/config_import_corelib_general.dart b/tests/language_2/import/config_corelib_general.dart
similarity index 100%
rename from tests/language_2/config_import_corelib_general.dart
rename to tests/language_2/import/config_corelib_general.dart
diff --git a/tests/language_2/config_import_corelib_http.dart b/tests/language_2/import/config_corelib_http.dart
similarity index 100%
rename from tests/language_2/config_import_corelib_http.dart
rename to tests/language_2/import/config_corelib_http.dart
diff --git a/tests/language_2/config_import_corelib_io.dart b/tests/language_2/import/config_corelib_io.dart
similarity index 100%
rename from tests/language_2/config_import_corelib_io.dart
rename to tests/language_2/import/config_corelib_io.dart
diff --git a/tests/language_2/config_import_corelib_test.dart b/tests/language_2/import/config_corelib_test.dart
similarity index 88%
rename from tests/language_2/config_import_corelib_test.dart
rename to tests/language_2/import/config_corelib_test.dart
index 9267d503fdf..362e41eb5b9 100644
--- a/tests/language_2/config_import_corelib_test.dart
+++ b/tests/language_2/import/config_corelib_test.dart
@@ -4,9 +4,9 @@
 
 import 'package:expect/expect.dart';
 
-import 'config_import_corelib_general.dart'
-    if (dart.library.io) 'config_import_corelib_io.dart'
-    if (dart.library.http) 'config_import_corelib_http.dart' as lib;
+import 'config_corelib_general.dart'
+    if (dart.library.io) 'config_corelib_io.dart'
+    if (dart.library.http) 'config_corelib_http.dart' as lib;
 
 class SubClassy extends lib.Classy {
   String get superName => super.name;
diff --git a/tests/language_2/import_core_no_prefix_test.dart b/tests/language_2/import/core_no_prefix_test.dart
similarity index 100%
rename from tests/language_2/import_core_no_prefix_test.dart
rename to tests/language_2/import/core_no_prefix_test.dart
diff --git a/tests/language_2/import_core_prefix_test.dart b/tests/language_2/import/core_prefix_test.dart
similarity index 100%
rename from tests/language_2/import_core_prefix_test.dart
rename to tests/language_2/import/core_prefix_test.dart
diff --git a/tests/language_2/import_core_test.dart b/tests/language_2/import/core_test.dart
similarity index 100%
rename from tests/language_2/import_core_test.dart
rename to tests/language_2/import/core_test.dart
diff --git a/tests/language_2/cyclic_import_test.dart b/tests/language_2/import/cyclic_test.dart
similarity index 100%
rename from tests/language_2/cyclic_import_test.dart
rename to tests/language_2/import/cyclic_test.dart
diff --git a/tests/language_2/import/duplicate_import_liba.dart b/tests/language_2/import/duplicate_import_liba.dart
new file mode 100644
index 00000000000..b8af1a7da68
--- /dev/null
+++ b/tests/language_2/import/duplicate_import_liba.dart
@@ -0,0 +1,13 @@
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library liba;
+
+var field;
+
+void method() {}
+
+class Class {}
+
+void methodOrClass() {}
diff --git a/tests/language_2/import/duplicate_libb.dart b/tests/language_2/import/duplicate_libb.dart
new file mode 100644
index 00000000000..456147fa8a9
--- /dev/null
+++ b/tests/language_2/import/duplicate_libb.dart
@@ -0,0 +1,13 @@
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library libb;
+
+var field;
+
+void method() {}
+
+class Class {}
+
+class methodOrClass {}
diff --git a/tests/language_2/duplicate_import_prefix_test.dart b/tests/language_2/import/duplicate_prefix_test.dart
similarity index 88%
rename from tests/language_2/duplicate_import_prefix_test.dart
rename to tests/language_2/import/duplicate_prefix_test.dart
index 9c288029ab4..bb5a36ceaab 100644
--- a/tests/language_2/duplicate_import_prefix_test.dart
+++ b/tests/language_2/import/duplicate_prefix_test.dart
@@ -5,6 +5,6 @@
 // Importing with a duplicate prefix is allowed.
 
 import "duplicate_import_liba.dart" as a;
-import "duplicate_import_libb.dart" as a;
+import "duplicate_libb.dart" as a;
 
 void main() {}
diff --git a/tests/language_2/export1_lib.dart b/tests/language_2/import/export1_lib.dart
similarity index 100%
rename from tests/language_2/export1_lib.dart
rename to tests/language_2/import/export1_lib.dart
diff --git a/tests/language_2/hidden_import_test.dart b/tests/language_2/import/hidden_import_test.dart
similarity index 84%
rename from tests/language_2/hidden_import_test.dart
rename to tests/language_2/import/hidden_import_test.dart
index ada103a70f8..4c51a190621 100644
--- a/tests/language_2/hidden_import_test.dart
+++ b/tests/language_2/import/hidden_import_test.dart
@@ -6,8 +6,8 @@
 
 library hidden_import;
 
-import 'hidden_import_lib.dart';
-import 'hidden_import_lib.dart' as prefix;
+import 'hidden_lib.dart';
+import 'hidden_lib.dart' as prefix;
 import 'dart:async';
 import 'dart:async' as prefix;
 
diff --git a/tests/language_2/hidden_import_lib.dart b/tests/language_2/import/hidden_lib.dart
similarity index 100%
rename from tests/language_2/hidden_import_lib.dart
rename to tests/language_2/import/hidden_lib.dart
diff --git a/tests/language_2/hidden_import_runtime_test.dart b/tests/language_2/import/hidden_runtime_test.dart
similarity index 86%
rename from tests/language_2/hidden_import_runtime_test.dart
rename to tests/language_2/import/hidden_runtime_test.dart
index aac0b6762d7..6a9964ed321 100644
--- a/tests/language_2/hidden_import_runtime_test.dart
+++ b/tests/language_2/import/hidden_runtime_test.dart
@@ -9,8 +9,8 @@
 
 library hidden_import;
 
-import 'hidden_import_lib.dart';
-import 'hidden_import_lib.dart' as prefix;
+import 'hidden_lib.dart';
+import 'hidden_lib.dart' as prefix;
 import 'dart:async';
 import 'dart:async' as prefix;
 
diff --git a/tests/language_2/import1_lib.dart b/tests/language_2/import/import1_lib.dart
similarity index 100%
rename from tests/language_2/import1_lib.dart
rename to tests/language_2/import/import1_lib.dart
diff --git a/tests/language_2/internal_library_runtime_test.dart b/tests/language_2/import/internal_library_runtime_test.dart
similarity index 100%
rename from tests/language_2/internal_library_runtime_test.dart
rename to tests/language_2/import/internal_library_runtime_test.dart
diff --git a/tests/language_2/internal_library_test.dart b/tests/language_2/import/internal_library_test.dart
similarity index 100%
rename from tests/language_2/internal_library_test.dart
rename to tests/language_2/import/internal_library_test.dart
diff --git a/tests/language_2/import_nonexisting_dart_uri_runtime_test.dart b/tests/language_2/import/nonexisting_dart_uri_runtime_test.dart
similarity index 100%
rename from tests/language_2/import_nonexisting_dart_uri_runtime_test.dart
rename to tests/language_2/import/nonexisting_dart_uri_runtime_test.dart
diff --git a/tests/language_2/import_nonexisting_dart_uri_test.dart b/tests/language_2/import/nonexisting_dart_uri_test.dart
similarity index 100%
rename from tests/language_2/import_nonexisting_dart_uri_test.dart
rename to tests/language_2/import/nonexisting_dart_uri_test.dart
diff --git a/tests/language_2/import_private_runtime_test.dart b/tests/language_2/import/private_runtime_test.dart
similarity index 100%
rename from tests/language_2/import_private_runtime_test.dart
rename to tests/language_2/import/private_runtime_test.dart
diff --git a/tests/language_2/import_private_test.dart b/tests/language_2/import/private_test.dart
similarity index 100%
rename from tests/language_2/import_private_test.dart
rename to tests/language_2/import/private_test.dart
diff --git a/tests/language_2/import_self_runtime_test.dart b/tests/language_2/import/self_runtime_test.dart
similarity index 100%
rename from tests/language_2/import_self_runtime_test.dart
rename to tests/language_2/import/self_runtime_test.dart
diff --git a/tests/language_2/import_self_test.dart b/tests/language_2/import/self_test.dart
similarity index 94%
rename from tests/language_2/import_self_test.dart
rename to tests/language_2/import/self_test.dart
index 98c9fc07b4b..1feeb8811d4 100644
--- a/tests/language_2/import_self_test.dart
+++ b/tests/language_2/import/self_test.dart
@@ -11,7 +11,7 @@ import "package:expect/expect.dart";
 
 // Eliminate the import of the unmodified file or else the analyzer
 // will generate the static error in the import_self_test_none case.
-import "import_self_test.dart" as p;
+import "self_test.dart" as p;
 
 var _x = "The quick brown fox jumps over the dazy log";
 
diff --git a/tests/language_2/import_show_lib.dart b/tests/language_2/import/show_lib.dart
similarity index 100%
rename from tests/language_2/import_show_lib.dart
rename to tests/language_2/import/show_lib.dart
diff --git a/tests/language_2/import_show_test.dart b/tests/language_2/import/show_test.dart
similarity index 89%
rename from tests/language_2/import_show_test.dart
rename to tests/language_2/import/show_test.dart
index d23c7a073e1..cb3a488b26a 100644
--- a/tests/language_2/import_show_test.dart
+++ b/tests/language_2/import/show_test.dart
@@ -5,7 +5,7 @@
 library import_show_test;
 
 import "package:expect/expect.dart";
-import "import_show_lib.dart" show theEnd;
+import "show_lib.dart" show theEnd;
 
 main() {
   var foo = theEnd;
diff --git a/tests/language_2/sub/sub.dart b/tests/language_2/import/sub/sub.dart
similarity index 71%
rename from tests/language_2/sub/sub.dart
rename to tests/language_2/import/sub/sub.dart
index 8ad0cde9e60..cd902474d2e 100644
--- a/tests/language_2/sub/sub.dart
+++ b/tests/language_2/import/sub/sub.dart
@@ -1,6 +1,6 @@
 library sub;
 
-import '../cyclic_import_test.dart';
+import '../cyclic_test.dart';
 import 'package:expect/expect.dart';
 
 subMain() {
diff --git a/tests/language_2/transitive_private_library_access_test.dart b/tests/language_2/import/transitive_private_library_access_test.dart
similarity index 100%
rename from tests/language_2/transitive_private_library_access_test.dart
rename to tests/language_2/import/transitive_private_library_access_test.dart
diff --git a/tests/language_2/type_inference_accessor_ref_runtime_1_test.dart b/tests/language_2/inference/accessor_ref_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/type_inference_accessor_ref_runtime_1_test.dart
rename to tests/language_2/inference/accessor_ref_runtime_1_test.dart
diff --git a/tests/language_2/type_inference_accessor_ref_runtime_2_test.dart b/tests/language_2/inference/accessor_ref_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/type_inference_accessor_ref_runtime_2_test.dart
rename to tests/language_2/inference/accessor_ref_runtime_2_test.dart
diff --git a/tests/language_2/type_inference_accessor_ref_runtime_3_test.dart b/tests/language_2/inference/accessor_ref_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/type_inference_accessor_ref_runtime_3_test.dart
rename to tests/language_2/inference/accessor_ref_runtime_3_test.dart
diff --git a/tests/language_2/type_inference_accessor_ref_runtime_4_test.dart b/tests/language_2/inference/accessor_ref_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/type_inference_accessor_ref_runtime_4_test.dart
rename to tests/language_2/inference/accessor_ref_runtime_4_test.dart
diff --git a/tests/language_2/type_inference_accessor_ref_runtime_test.dart b/tests/language_2/inference/accessor_ref_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_inference_accessor_ref_runtime_test.dart
rename to tests/language_2/inference/accessor_ref_runtime_test.dart
diff --git a/tests/language_2/type_inference_accessor_ref_test.dart b/tests/language_2/inference/accessor_ref_test.dart
similarity index 100%
rename from tests/language_2/type_inference_accessor_ref_test.dart
rename to tests/language_2/inference/accessor_ref_test.dart
diff --git a/tests/language_2/type_inference_circularity_test.dart b/tests/language_2/inference/circularity_test.dart
similarity index 100%
rename from tests/language_2/type_inference_circularity_test.dart
rename to tests/language_2/inference/circularity_test.dart
diff --git a/tests/language_2/type_inference_inconsistent_inheritance_test.dart b/tests/language_2/inference/inconsistent_inheritance_test.dart
similarity index 100%
rename from tests/language_2/type_inference_inconsistent_inheritance_test.dart
rename to tests/language_2/inference/inconsistent_inheritance_test.dart
diff --git a/tests/language_2/initializing_formal_access_test.dart b/tests/language_2/initializing_formal/access_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_access_test.dart
rename to tests/language_2/initializing_formal/access_test.dart
diff --git a/tests/language_2/initializing_formal_capture_test.dart b/tests/language_2/initializing_formal/capture_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_capture_test.dart
rename to tests/language_2/initializing_formal/capture_test.dart
diff --git a/tests/language_2/initializing_formal_final_test.dart b/tests/language_2/initializing_formal/final_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_final_test.dart
rename to tests/language_2/initializing_formal/final_test.dart
diff --git a/tests/language_2/initializing_formal_promotion_test.dart b/tests/language_2/initializing_formal/promotion_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_promotion_test.dart
rename to tests/language_2/initializing_formal/promotion_test.dart
diff --git a/tests/language_2/initializing_formal_scope_test.dart b/tests/language_2/initializing_formal/scope_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_scope_test.dart
rename to tests/language_2/initializing_formal/scope_test.dart
diff --git a/tests/language_2/initializing_formal_type_annotation_runtime_test.dart b/tests/language_2/initializing_formal/type_annotation_runtime_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_type_annotation_runtime_test.dart
rename to tests/language_2/initializing_formal/type_annotation_runtime_test.dart
diff --git a/tests/language_2/initializing_formal_type_annotation_test.dart b/tests/language_2/initializing_formal/type_annotation_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_type_annotation_test.dart
rename to tests/language_2/initializing_formal/type_annotation_test.dart
diff --git a/tests/language_2/initializing_formal_type_test.dart b/tests/language_2/initializing_formal/type_test.dart
similarity index 100%
rename from tests/language_2/initializing_formal_type_test.dart
rename to tests/language_2/initializing_formal/type_test.dart
diff --git a/tests/language_2/instance_call_wrong_argument_count_test.dart b/tests/language_2/instance/call_wrong_argument_count_test.dart
similarity index 100%
rename from tests/language_2/instance_call_wrong_argument_count_test.dart
rename to tests/language_2/instance/call_wrong_argument_count_test.dart
diff --git a/tests/language_2/instance_compound_assignment_operator_test.dart b/tests/language_2/instance/compound_assignment_operator_test.dart
similarity index 100%
rename from tests/language_2/instance_compound_assignment_operator_test.dart
rename to tests/language_2/instance/compound_assignment_operator_test.dart
diff --git a/tests/language_2/instance_field_initializer_test.dart b/tests/language_2/instance/field_initializer_test.dart
similarity index 100%
rename from tests/language_2/instance_field_initializer_test.dart
rename to tests/language_2/instance/field_initializer_test.dart
diff --git a/tests/language_2/instance_incr_deopt_test.dart b/tests/language_2/instance/incr_deopt_test.dart
similarity index 100%
rename from tests/language_2/instance_incr_deopt_test.dart
rename to tests/language_2/instance/incr_deopt_test.dart
diff --git a/tests/language_2/instance_inline_test.dart b/tests/language_2/instance/inline_test.dart
similarity index 100%
rename from tests/language_2/instance_inline_test.dart
rename to tests/language_2/instance/inline_test.dart
diff --git a/tests/language_2/instance_method2_test.dart b/tests/language_2/instance/method2_test.dart
similarity index 100%
rename from tests/language_2/instance_method2_test.dart
rename to tests/language_2/instance/method2_test.dart
diff --git a/tests/language_2/instance_method_test.dart b/tests/language_2/instance/method_test.dart
similarity index 100%
rename from tests/language_2/instance_method_test.dart
rename to tests/language_2/instance/method_test.dart
diff --git a/tests/language_2/interceptor2_test.dart b/tests/language_2/interceptor/interceptor2_test.dart
similarity index 100%
rename from tests/language_2/interceptor2_test.dart
rename to tests/language_2/interceptor/interceptor2_test.dart
diff --git a/tests/language_2/interceptor3_test.dart b/tests/language_2/interceptor/interceptor3_test.dart
similarity index 100%
rename from tests/language_2/interceptor3_test.dart
rename to tests/language_2/interceptor/interceptor3_test.dart
diff --git a/tests/language_2/interceptor4_test.dart b/tests/language_2/interceptor/interceptor4_test.dart
similarity index 100%
rename from tests/language_2/interceptor4_test.dart
rename to tests/language_2/interceptor/interceptor4_test.dart
diff --git a/tests/language_2/interceptor5_test.dart b/tests/language_2/interceptor/interceptor5_test.dart
similarity index 100%
rename from tests/language_2/interceptor5_test.dart
rename to tests/language_2/interceptor/interceptor5_test.dart
diff --git a/tests/language_2/interceptor7_test.dart b/tests/language_2/interceptor/interceptor7_test.dart
similarity index 100%
rename from tests/language_2/interceptor7_test.dart
rename to tests/language_2/interceptor/interceptor7_test.dart
diff --git a/tests/language_2/interceptor8_test.dart b/tests/language_2/interceptor/interceptor8_test.dart
similarity index 100%
rename from tests/language_2/interceptor8_test.dart
rename to tests/language_2/interceptor/interceptor8_test.dart
diff --git a/tests/language_2/interceptor9_test.dart b/tests/language_2/interceptor/interceptor9_test.dart
similarity index 100%
rename from tests/language_2/interceptor9_test.dart
rename to tests/language_2/interceptor/interceptor9_test.dart
diff --git a/tests/language_2/interceptor_test.dart b/tests/language_2/interceptor/interceptor_test.dart
similarity index 100%
rename from tests/language_2/interceptor_test.dart
rename to tests/language_2/interceptor/interceptor_test.dart
diff --git a/tests/language_2/interface_constants_test.dart b/tests/language_2/interface/constants_test.dart
similarity index 100%
rename from tests/language_2/interface_constants_test.dart
rename to tests/language_2/interface/constants_test.dart
diff --git a/tests/language_2/interface_cycle_test.dart b/tests/language_2/interface/cycle_test.dart
similarity index 100%
rename from tests/language_2/interface_cycle_test.dart
rename to tests/language_2/interface/cycle_test.dart
diff --git a/tests/language_2/duplicate_implements_test.dart b/tests/language_2/interface/duplicate_implements_test.dart
similarity index 100%
rename from tests/language_2/duplicate_implements_test.dart
rename to tests/language_2/interface/duplicate_implements_test.dart
diff --git a/tests/language_2/duplicate_interface_implements_runtime_test.dart b/tests/language_2/interface/duplicate_interface_implements_runtime_test.dart
similarity index 100%
rename from tests/language_2/duplicate_interface_implements_runtime_test.dart
rename to tests/language_2/interface/duplicate_interface_implements_runtime_test.dart
diff --git a/tests/language_2/duplicate_interface_implements_test.dart b/tests/language_2/interface/duplicate_interface_implements_test.dart
similarity index 100%
rename from tests/language_2/duplicate_interface_implements_test.dart
rename to tests/language_2/interface/duplicate_interface_implements_test.dart
diff --git a/tests/language_2/duplicate_interface_lib.dart b/tests/language_2/interface/duplicate_interface_lib.dart
similarity index 100%
rename from tests/language_2/duplicate_interface_lib.dart
rename to tests/language_2/interface/duplicate_interface_lib.dart
diff --git a/tests/language_2/duplicate_interface_test.dart b/tests/language_2/interface/duplicate_interface_test.dart
similarity index 100%
rename from tests/language_2/duplicate_interface_test.dart
rename to tests/language_2/interface/duplicate_interface_test.dart
diff --git a/tests/language_2/implements_futureor_runtime_test.dart b/tests/language_2/interface/implements_futureor_runtime_test.dart
similarity index 100%
rename from tests/language_2/implements_futureor_runtime_test.dart
rename to tests/language_2/interface/implements_futureor_runtime_test.dart
diff --git a/tests/language_2/implements_futureor_test.dart b/tests/language_2/interface/implements_futureor_test.dart
similarity index 100%
rename from tests/language_2/implements_futureor_test.dart
rename to tests/language_2/interface/implements_futureor_test.dart
diff --git a/tests/language_2/interface_inherit_field_test.dart b/tests/language_2/interface/inherit_field_test.dart
similarity index 100%
rename from tests/language_2/interface_inherit_field_test.dart
rename to tests/language_2/interface/inherit_field_test.dart
diff --git a/tests/language_2/interface_injection1_runtime_test.dart b/tests/language_2/interface/injection1_runtime_test.dart
similarity index 100%
rename from tests/language_2/interface_injection1_runtime_test.dart
rename to tests/language_2/interface/injection1_runtime_test.dart
diff --git a/tests/language_2/interface_injection1_test.dart b/tests/language_2/interface/injection1_test.dart
similarity index 100%
rename from tests/language_2/interface_injection1_test.dart
rename to tests/language_2/interface/injection1_test.dart
diff --git a/tests/language_2/interface_injection2_runtime_test.dart b/tests/language_2/interface/injection2_runtime_test.dart
similarity index 100%
rename from tests/language_2/interface_injection2_runtime_test.dart
rename to tests/language_2/interface/injection2_runtime_test.dart
diff --git a/tests/language_2/interface_injection2_test.dart b/tests/language_2/interface/injection2_test.dart
similarity index 100%
rename from tests/language_2/interface_injection2_test.dart
rename to tests/language_2/interface/injection2_test.dart
diff --git a/tests/language_2/interface2_test.dart b/tests/language_2/interface/interface2_test.dart
similarity index 100%
rename from tests/language_2/interface2_test.dart
rename to tests/language_2/interface/interface2_test.dart
diff --git a/tests/language_2/interface_test.dart b/tests/language_2/interface/interface_test.dart
similarity index 100%
rename from tests/language_2/interface_test.dart
rename to tests/language_2/interface/interface_test.dart
diff --git a/tests/language_2/interface_runtime_test.dart b/tests/language_2/interface/runtime_test.dart
similarity index 100%
rename from tests/language_2/interface_runtime_test.dart
rename to tests/language_2/interface/runtime_test.dart
diff --git a/tests/language_2/interface_static_method_test.dart b/tests/language_2/interface/static_method_test.dart
similarity index 100%
rename from tests/language_2/interface_static_method_test.dart
rename to tests/language_2/interface/static_method_test.dart
diff --git a/tests/language_2/is_function_test.dart b/tests/language_2/is/function_test.dart
similarity index 100%
rename from tests/language_2/is_function_test.dart
rename to tests/language_2/is/function_test.dart
diff --git a/tests/language_2/instanceof_test.dart b/tests/language_2/is/instanceof_test.dart
similarity index 100%
rename from tests/language_2/instanceof_test.dart
rename to tests/language_2/is/instanceof_test.dart
diff --git a/tests/language_2/is_interfaces2_test.dart b/tests/language_2/is/interfaces2_test.dart
similarity index 100%
rename from tests/language_2/is_interfaces2_test.dart
rename to tests/language_2/is/interfaces2_test.dart
diff --git a/tests/language_2/is_interfaces_test.dart b/tests/language_2/is/interfaces_test.dart
similarity index 100%
rename from tests/language_2/is_interfaces_test.dart
rename to tests/language_2/is/interfaces_test.dart
diff --git a/tests/language_2/instanceof2_test.dart b/tests/language_2/is/is2_test.dart
similarity index 100%
rename from tests/language_2/instanceof2_test.dart
rename to tests/language_2/is/is2_test.dart
diff --git a/tests/language_2/instanceof4_test.dart b/tests/language_2/is/is4_test.dart
similarity index 100%
rename from tests/language_2/instanceof4_test.dart
rename to tests/language_2/is/is4_test.dart
diff --git a/tests/language_2/isnot_malformed_type_runtime_test.dart b/tests/language_2/is/isnot_malformed_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/isnot_malformed_type_runtime_test.dart
rename to tests/language_2/is/isnot_malformed_type_runtime_test.dart
diff --git a/tests/language_2/isnot_malformed_type_test.dart b/tests/language_2/is/isnot_malformed_type_test.dart
similarity index 100%
rename from tests/language_2/isnot_malformed_type_test.dart
rename to tests/language_2/is/isnot_malformed_type_test.dart
diff --git a/tests/language_2/is_malformed_type_runtime_test.dart b/tests/language_2/is/malformed_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/is_malformed_type_runtime_test.dart
rename to tests/language_2/is/malformed_type_runtime_test.dart
diff --git a/tests/language_2/is_malformed_type_test.dart b/tests/language_2/is/malformed_type_test.dart
similarity index 100%
rename from tests/language_2/is_malformed_type_test.dart
rename to tests/language_2/is/malformed_type_test.dart
diff --git a/tests/language_2/is_nan_test.dart b/tests/language_2/is/nan_test.dart
similarity index 100%
rename from tests/language_2/is_nan_test.dart
rename to tests/language_2/is/nan_test.dart
diff --git a/tests/language_2/is_not_class1_test.dart b/tests/language_2/is/not_class1_test.dart
similarity index 100%
rename from tests/language_2/is_not_class1_test.dart
rename to tests/language_2/is/not_class1_test.dart
diff --git a/tests/language_2/is_not_class2_runtime_test.dart b/tests/language_2/is/not_class2_runtime_test.dart
similarity index 100%
rename from tests/language_2/is_not_class2_runtime_test.dart
rename to tests/language_2/is/not_class2_runtime_test.dart
diff --git a/tests/language_2/is_not_class2_test.dart b/tests/language_2/is/not_class2_test.dart
similarity index 100%
rename from tests/language_2/is_not_class2_test.dart
rename to tests/language_2/is/not_class2_test.dart
diff --git a/tests/language_2/is_not_class4_test.dart b/tests/language_2/is/not_class4_test.dart
similarity index 100%
rename from tests/language_2/is_not_class4_test.dart
rename to tests/language_2/is/not_class4_test.dart
diff --git a/tests/language_2/is_object_test.dart b/tests/language_2/is/object_test.dart
similarity index 100%
rename from tests/language_2/is_object_test.dart
rename to tests/language_2/is/object_test.dart
diff --git a/tests/language_2/is_operator_clash_test.dart b/tests/language_2/is/operator_clash_test.dart
similarity index 100%
rename from tests/language_2/is_operator_clash_test.dart
rename to tests/language_2/is/operator_clash_test.dart
diff --git a/tests/language_2/is_operator_test.dart b/tests/language_2/is/operator_test.dart
similarity index 100%
rename from tests/language_2/is_operator_test.dart
rename to tests/language_2/is/operator_test.dart
diff --git a/tests/language_2/instanceof_optimized_test.dart b/tests/language_2/is/optimized_test.dart
similarity index 100%
rename from tests/language_2/instanceof_optimized_test.dart
rename to tests/language_2/is/optimized_test.dart
diff --git a/tests/language_2/issue_1751477_lib1.dart b/tests/language_2/issue_1751477_lib1.dart
deleted file mode 100644
index 6ef54315ad3..00000000000
--- a/tests/language_2/issue_1751477_lib1.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib1;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib1_func() {}
diff --git a/tests/language_2/issue_1751477_lib11.dart b/tests/language_2/issue_1751477_lib11.dart
deleted file mode 100644
index dd5dad68035..00000000000
--- a/tests/language_2/issue_1751477_lib11.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib11;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib11_func() {}
diff --git a/tests/language_2/issue_1751477_lib2.dart b/tests/language_2/issue_1751477_lib2.dart
deleted file mode 100644
index 2185773c71c..00000000000
--- a/tests/language_2/issue_1751477_lib2.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib2;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib2_func() {}
diff --git a/tests/language_2/issue_1751477_lib21.dart b/tests/language_2/issue_1751477_lib21.dart
deleted file mode 100644
index 0bd1d2bd98b..00000000000
--- a/tests/language_2/issue_1751477_lib21.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib21;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib21_func() {}
diff --git a/tests/language_2/issue_1751477_lib3.dart b/tests/language_2/issue_1751477_lib3.dart
deleted file mode 100644
index 6674221b191..00000000000
--- a/tests/language_2/issue_1751477_lib3.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib3;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib3_func() {}
diff --git a/tests/language_2/issue_1751477_lib31.dart b/tests/language_2/issue_1751477_lib31.dart
deleted file mode 100644
index c8d08b742e2..00000000000
--- a/tests/language_2/issue_1751477_lib31.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib31;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib31_func() {}
diff --git a/tests/language_2/issue_1751477_lib4.dart b/tests/language_2/issue_1751477_lib4.dart
deleted file mode 100644
index 90769288261..00000000000
--- a/tests/language_2/issue_1751477_lib4.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib4;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib4_func() {}
diff --git a/tests/language_2/issue_1751477_lib41.dart b/tests/language_2/issue_1751477_lib41.dart
deleted file mode 100644
index e608297c098..00000000000
--- a/tests/language_2/issue_1751477_lib41.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib41;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib41_func() {}
diff --git a/tests/language_2/issue_1751477_lib5.dart b/tests/language_2/issue_1751477_lib5.dart
deleted file mode 100644
index ab3cfe762e9..00000000000
--- a/tests/language_2/issue_1751477_lib5.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib5;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib5_func() {}
diff --git a/tests/language_2/issue_1751477_lib51.dart b/tests/language_2/issue_1751477_lib51.dart
deleted file mode 100644
index b3a4e7b10ff..00000000000
--- a/tests/language_2/issue_1751477_lib51.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib51;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib51_func() {}
diff --git a/tests/language_2/issue_1751477_lib6.dart b/tests/language_2/issue_1751477_lib6.dart
deleted file mode 100644
index 0fe3928e366..00000000000
--- a/tests/language_2/issue_1751477_lib6.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib6;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib6_func() {}
diff --git a/tests/language_2/issue_1751477_lib61.dart b/tests/language_2/issue_1751477_lib61.dart
deleted file mode 100644
index 2497f4d54df..00000000000
--- a/tests/language_2/issue_1751477_lib61.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib61;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib61_func() {}
diff --git a/tests/language_2/issue_1751477_lib7.dart b/tests/language_2/issue_1751477_lib7.dart
deleted file mode 100644
index 4ebae76c9f3..00000000000
--- a/tests/language_2/issue_1751477_lib7.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib7;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib7_func() {}
diff --git a/tests/language_2/issue_1751477_lib71.dart b/tests/language_2/issue_1751477_lib71.dart
deleted file mode 100644
index 4ac3ed03ff3..00000000000
--- a/tests/language_2/issue_1751477_lib71.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib71;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib71_func() {}
diff --git a/tests/language_2/issue_1751477_lib8.dart b/tests/language_2/issue_1751477_lib8.dart
deleted file mode 100644
index 4f59a5bea3d..00000000000
--- a/tests/language_2/issue_1751477_lib8.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib8;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib8_func() {}
diff --git a/tests/language_2/issue_1751477_lib81.dart b/tests/language_2/issue_1751477_lib81.dart
deleted file mode 100644
index c1ac589341f..00000000000
--- a/tests/language_2/issue_1751477_lib81.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib81;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib91.dart';
-
-lib81_func() {}
diff --git a/tests/language_2/issue_1751477_lib9.dart b/tests/language_2/issue_1751477_lib9.dart
deleted file mode 100644
index 3dd8231e217..00000000000
--- a/tests/language_2/issue_1751477_lib9.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib9;
-
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib1.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-import 'issue_1751477_lib91.dart';
-
-lib9_func() {}
diff --git a/tests/language_2/issue_1751477_lib91.dart b/tests/language_2/issue_1751477_lib91.dart
deleted file mode 100644
index 17e01b6f98c..00000000000
--- a/tests/language_2/issue_1751477_lib91.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-library lib91;
-
-import 'issue_1751477_lib1.dart';
-import 'issue_1751477_lib2.dart';
-import 'issue_1751477_lib3.dart';
-import 'issue_1751477_lib4.dart';
-import 'issue_1751477_lib5.dart';
-import 'issue_1751477_lib6.dart';
-import 'issue_1751477_lib7.dart';
-import 'issue_1751477_lib8.dart';
-import 'issue_1751477_lib9.dart';
-
-import 'issue_1751477_lib11.dart';
-import 'issue_1751477_lib21.dart';
-import 'issue_1751477_lib31.dart';
-import 'issue_1751477_lib41.dart';
-import 'issue_1751477_lib51.dart';
-import 'issue_1751477_lib61.dart';
-import 'issue_1751477_lib71.dart';
-import 'issue_1751477_lib81.dart';
-
-lib91_func() {}
diff --git a/tests/language_2/label3_runtime_1_test.dart b/tests/language_2/label/label3_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/label3_runtime_1_test.dart
rename to tests/language_2/label/label3_runtime_1_test.dart
diff --git a/tests/language_2/label3_runtime_test.dart b/tests/language_2/label/label3_runtime_test.dart
similarity index 100%
rename from tests/language_2/label3_runtime_test.dart
rename to tests/language_2/label/label3_runtime_test.dart
diff --git a/tests/language_2/label3_test.dart b/tests/language_2/label/label3_test.dart
similarity index 100%
rename from tests/language_2/label3_test.dart
rename to tests/language_2/label/label3_test.dart
diff --git a/tests/language_2/label5_runtime_test.dart b/tests/language_2/label/label5_runtime_test.dart
similarity index 100%
rename from tests/language_2/label5_runtime_test.dart
rename to tests/language_2/label/label5_runtime_test.dart
diff --git a/tests/language_2/label5_test.dart b/tests/language_2/label/label5_test.dart
similarity index 100%
rename from tests/language_2/label5_test.dart
rename to tests/language_2/label/label5_test.dart
diff --git a/tests/language_2/label6_runtime_1_test.dart b/tests/language_2/label/label6_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/label6_runtime_1_test.dart
rename to tests/language_2/label/label6_runtime_1_test.dart
diff --git a/tests/language_2/label6_runtime_2_test.dart b/tests/language_2/label/label6_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/label6_runtime_2_test.dart
rename to tests/language_2/label/label6_runtime_2_test.dart
diff --git a/tests/language_2/label6_runtime_test.dart b/tests/language_2/label/label6_runtime_test.dart
similarity index 100%
rename from tests/language_2/label6_runtime_test.dart
rename to tests/language_2/label/label6_runtime_test.dart
diff --git a/tests/language_2/label6_test.dart b/tests/language_2/label/label6_test.dart
similarity index 100%
rename from tests/language_2/label6_test.dart
rename to tests/language_2/label/label6_test.dart
diff --git a/tests/language_2/label8_runtime_test.dart b/tests/language_2/label/label8_runtime_test.dart
similarity index 100%
rename from tests/language_2/label8_runtime_test.dart
rename to tests/language_2/label/label8_runtime_test.dart
diff --git a/tests/language_2/label8_test.dart b/tests/language_2/label/label8_test.dart
similarity index 100%
rename from tests/language_2/label8_test.dart
rename to tests/language_2/label/label8_test.dart
diff --git a/tests/language_2/label_test.dart b/tests/language_2/label/label_test.dart
similarity index 100%
rename from tests/language_2/label_test.dart
rename to tests/language_2/label/label_test.dart
diff --git a/tests/language_2/language_2.status b/tests/language_2/language_2.status
index 796193b4ae2..79444306422 100644
--- a/tests/language_2/language_2.status
+++ b/tests/language_2/language_2.status
@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 [ $compiler != dart2analyzer ]
-switch_case_warn_test: Skip # Analyzer only, see language_analyzer2.status
+switch/case_warn_test: Skip # Analyzer only, see language_analyzer2.status
 
 [ $compiler != fasta ]
 nonfunction_type_aliases/*: Skip # github.com/dart-lang/language/issues/115
@@ -19,28 +19,28 @@ mixin_declaration/*: Skip # See https://github.com/dart-lang/language/issues/7
 void/*: Skip # https://github.com/dart-lang/sdk/issues/34015
 
 [ $mode == debug ]
-large_class_declaration_test: Slow
+class/large_class_declaration_test: Slow
 
 [ $mode == product ]
-assertion_test: SkipByDesign # Requires checked mode.
-generic_test: SkipByDesign # Requires checked mode.
-issue13474_test: SkipByDesign # Requires checked mode.
-map_literal4_test: SkipByDesign # Requires checked mode.
-named_parameters_type_test/01: SkipByDesign # Requires checked mode.
-named_parameters_type_test/02: SkipByDesign # Requires checked mode.
-named_parameters_type_test/03: SkipByDesign # Requires checked mode.
-positional_parameters_type_test/01: SkipByDesign # Requires checked mode.
-positional_parameters_type_test/02: SkipByDesign # Requires checked mode.
-regress_29784_test/02: SkipByDesign # Requires checked mode.
-stacktrace_demangle_ctors_test: SkipByDesign # Names are not scrubbed.
-type_checks_in_factory_method_test: SkipByDesign # Requires checked mode.
+assert/assert_test: SkipByDesign # Requires checked mode.
+generic/generic_test: SkipByDesign # Requires checked mode.
+map/literal4_test: SkipByDesign # Requires checked mode.
+parameter/named_type_test/01: SkipByDesign # Requires checked mode.
+parameter/named_type_test/02: SkipByDesign # Requires checked mode.
+parameter/named_type_test/03: SkipByDesign # Requires checked mode.
+parameter/positional_type_test/01: SkipByDesign # Requires checked mode.
+parameter/positional_type_test/02: SkipByDesign # Requires checked mode.
+regress/regress13474_test: SkipByDesign # Requires checked mode.
+regress/regress29784_test/02: SkipByDesign # Requires checked mode.
+stack_trace/demangle_ctors_test: SkipByDesign # Names are not scrubbed.
+type/checks_in_factory_method_test: SkipByDesign # Requires checked mode.
 
 [ $compiler != dart2js && $compiler != dartdevc && !$checked ]
 function_type/*: Skip # Needs checked mode.
 
 [ $compiler != dartk && $compiler != dartkb && $compiler != dartkp && $mode == debug && $runtime == vm ]
-built_in_identifier_type_annotation_test/set: Crash # Not supported by legacy VM front-end.
+identifier/built_in_type_annotation_test/set: Crash # Not supported by legacy VM front-end.
 
 [ $hot_reload || $hot_reload_rollback ]
-issue_22780_test/01: Crash # Issue 29094
+regress/regress22780_test/01: Crash # Issue 29094
 vm/optimized_stacktrace_test: Slow
diff --git a/tests/language_2/language_2_analyzer.status b/tests/language_2/language_2_analyzer.status
index 372d94b228c..23eabf4c580 100644
--- a/tests/language_2/language_2_analyzer.status
+++ b/tests/language_2/language_2_analyzer.status
@@ -5,7 +5,7 @@
 # Sections in this file should contain "$compiler == dart2analyzer".
 
 [ $compiler == dart2analyzer ]
-large_class_declaration_test: Slow
+class/large_class_declaration_test: Slow
 vm/debug_break_enabled_vm_test: Skip
 vm/debug_break_vm_test/*: Skip
 vm/regress_27201_test: SkipByDesign # Loads bad library, so will always crash.
diff --git a/tests/language_2/language_2_dart2js.status b/tests/language_2/language_2_dart2js.status
index 275c483e460..5bdb44427e5 100644
--- a/tests/language_2/language_2_dart2js.status
+++ b/tests/language_2/language_2_dart2js.status
@@ -4,12 +4,12 @@
 # Sections in this file should contain "$compiler == dart2js".
 
 [ $compiler == dart2js ]
-int64_literal_runtime*_test: Skip  # This is testing Dart 2.0 int64 semantics
 mixin_method_override_test/G5: Skip # Issue 34354
+number/int64_literal_runtime*_test: Skip # This is testing Dart 2.0 int64 semantics
 vm/*: SkipByDesign # Tests for the VM.
 
 [ $compiler != dart2js ]
-minify_closure_variable_collision_test: SkipByDesign # Regression test for dart2js
+closure/minify_closure_variable_collision_test: SkipByDesign # Regression test for dart2js
 
 [ $builder_tag == dart2js_production && $compiler == dart2js ]
 control_flow_collections/for_non_bool_condition_test: Crash # Issue 36442
@@ -18,15 +18,14 @@ control_flow_collections/for_non_bool_condition_test: Crash # Issue 36442
 override_field_test/02: Slow # TODO(kasperl): Please triage.
 
 [ $compiler == dart2js && $runtime == d8 ]
-conditional_import_string_test: SkipByDesign # No XHR in d8
-conditional_import_test: SkipByDesign # No XHR in d8
+import/conditional_string_test: SkipByDesign # No XHR in d8
+import/conditional_test: SkipByDesign # No XHR in d8
 
 [ $compiler == dart2js && $runtime == jsshell ]
-await_for_test: Skip # Jsshell does not provide periodic timers, Issue 7728
+await/for_test: Skip # Jsshell does not provide periodic timers, Issue 7728
 
 [ $compiler == dart2js && $system == windows ]
-canonicalization_hashing_memoize_array_test: Skip # Issue 37631
-canonicalization_hashing_memoize_instance_test: Skip # Issue 37631
-canonicalization_hashing_shallow_collision_array_test: Skip # Issue 37631
-canonicalization_hashing_shallow_collision_instance_test: Skip # Issue 37631
-
+canonicalize/hashing_memoize_array_test: Skip # Issue 37631
+canonicalize/hashing_memoize_instance_test: Skip # Issue 37631
+canonicalize/hashing_shallow_collision_array_test: Skip # Issue 37631
+canonicalize/hashing_shallow_collision_instance_test: Skip # Issue 37631
diff --git a/tests/language_2/language_2_dartdevc.status b/tests/language_2/language_2_dartdevc.status
index 35e3516e055..f94dbaafc78 100644
--- a/tests/language_2/language_2_dartdevc.status
+++ b/tests/language_2/language_2_dartdevc.status
@@ -4,20 +4,20 @@
 
 # Sections in this file should contain "$compiler == dartdevc" or dartdevk.
 [ $compiler == dartdevc ]
-const_double_in_int_op_test/dd6: Skip # Triple shift
-const_double_in_int_op_test/di6: Skip # Triple shift
-const_double_in_int_op_test/id6: Skip # Triple shift
-const_double_in_int_op_test/ii6: Skip # Triple shift
+class/large_class_declaration_test: Slow
+const/double_in_int_op_test/dd6: Skip # Triple shift
+const/double_in_int_op_test/di6: Skip # Triple shift
+const/double_in_int_op_test/id6: Skip # Triple shift
+const/double_in_int_op_test/ii6: Skip # Triple shift
 extension_methods/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing extension methods.
-large_class_declaration_test: Slow
 nnbd/*: Skip
 variance/*: SkipByDesign # Analyzer DDC is expected to be turned down before releasing variance.
 
 [ $compiler == dartdevk && !$checked ]
-assertion_initializer_const_error2_test/*: SkipByDesign # DDC does not support non-checked mode.
+assert/initializer_const_error2_test/*: SkipByDesign # DDC does not support non-checked mode.
 
 [ $compiler == dartdevc || $compiler == dartdevk ]
-asyncstar_throw_in_catch_test: Skip # Times out. Issue 29920
-int64_literal_runtime*_test: Skip # This is testing Dart 2.0 int64 semantics.
+async_star/throw_in_catch_test: Skip # Times out. Issue 29920
+number/int64_literal_runtime*_test: Skip # This is testing Dart 2.0 int64 semantics.
 superinterface_variance/*: Skip # Issue dart-lang/language#113
 vm/*: SkipByDesign # VM only tests.; VM only tests.
diff --git a/tests/language_2/language_2_kernel.status b/tests/language_2/language_2_kernel.status
index 9b431342e54..3910863ec15 100644
--- a/tests/language_2/language_2_kernel.status
+++ b/tests/language_2/language_2_kernel.status
@@ -4,17 +4,17 @@
 
 
 [ $compiler == app_jitk ]
-no_main_test/01: Crash
+main/no_main_test/01: Crash
+number/web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 vm/regress_27671_test: SkipByDesign # Relies on string comparison of exception message which may return '<optimized out>'
-web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $compiler == dartkp ]
-web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
+number/web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $compiler == fasta ]
-async_await_syntax_test/e5: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
-async_await_syntax_test/e6: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
-web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
+async/await_syntax_test/e5: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
+async/await_syntax_test/e6: Crash # Assertion error: continuation.dart: Failed assertion: 'node.expression == null || node.expression is NullLiteral': is not true.
+number/web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $fasta ]
 nnbd/*: Skip
@@ -33,15 +33,15 @@ superinterface_variance/mixin_error_test/47: Crash # Issue dart-lang/language#11
 superinterface_variance/mixin_error_test/48: Crash # Issue dart-lang/language#113
 
 [ $builder_tag == obfuscated && $compiler == dartkp ]
-generic_function_dcall_test/01: SkipByDesign # Prints type names
-many_named_arguments_test: SkipByDesign # Checks names of arguments
-mixin_generic_test: SkipByDesign # Prints type names
-mixin_mixin3_test: SkipByDesign # Prints type names
-mixin_mixin5_test: SkipByDesign # Prints type names
-mixin_mixin6_test: SkipByDesign # Prints type names
-mixin_mixin_bound2_test: SkipByDesign # Prints type names
-symbol_literal_test/02: SkipByDesign # We don't obfuscate const Symbol constructor
-type_literal_test: SkipByDesign # Uses lots of strings with type names in them
+generic/function_dcall_test/01: SkipByDesign # Prints type names
+mixin/generic_test: SkipByDesign # Prints type names
+mixin/mixin3_test: SkipByDesign # Prints type names
+mixin/mixin5_test: SkipByDesign # Prints type names
+mixin/mixin6_test: SkipByDesign # Prints type names
+mixin/mixin_bound2_test: SkipByDesign # Prints type names
+type_object/literal_test: SkipByDesign # Uses lots of strings with type names in them
+unsorted/many_named_arguments_test: SkipByDesign # Checks names of arguments
+unsorted/symbol_literal_test/02: SkipByDesign # We don't obfuscate const Symbol constructor
 vm/bool_check_stack_traces_test: SkipByDesign # Looks for filenames in stacktrace output
 vm/no_such_args_error_message_vm_test: SkipByDesign # Looks for function name in error message
 vm/no_such_method_error_message_callable_vm_test: SkipByDesign # Expects unobfuscated method names
@@ -49,44 +49,44 @@ vm/no_such_method_error_message_vm_test: SkipByDesign # Looks for unobfuscated n
 vm/regress_28325_test: SkipByDesign # Looks for filename in stack trace
 
 [ $compiler == dartk && $mode == debug && ($hot_reload || $hot_reload_rollback) ]
-inference_enum_list_test: Skip # Issue 35885
+unsorted/inference_enum_list_test: Skip # Issue 35885
 
 [ $compiler == dartkp && $mode == debug && $runtime == dart_precompiled ]
 vm/precompiled_static_initializer_test: Slow
 
 # ==== dartkp + dart_precompiled status lines ====
 [ $compiler == dartkp && $runtime == dart_precompiled ]
-assert_with_type_test_or_cast_test: Crash
-const_evaluation_test: SkipByDesign
-ct_const2_test: Skip # Incompatible flag: --compile_all
-deferred_redirecting_factory_test: Crash # Issue 23408, KernelVM bug: Deferred loading kernel issue 30273.
-deopt_inlined_function_lazy_test: Skip # Incompatible flag: --deoptimize-alot
-enum_mirror_test: SkipByDesign
-export_ambiguous_main_test: Skip # Issue 29895 Fail Issue 14763
-export_double_same_main_test: Skip # Issue 29895 Crash Issue 29895
-field_increment_bailout_test: SkipByDesign
+assert/with_type_test_or_cast_test: Crash
+closure/implicit_test: Skip # Incompatible flag: --use_slow_path
+const/const2_test: Skip # Incompatible flag: --compile_all
+const/evaluation_test: SkipByDesign
+deferred/redirecting_factory_test: Crash # Issue 23408, KernelVM bug: Deferred loading kernel issue 30273.
+enum/mirror_test: SkipByDesign
+export/ambiguous_main_test: Skip # Issue 29895 Fail Issue 14763
+export/double_same_main_test: Skip # Issue 29895 Crash Issue 29895
+field/increment_bailout_test: SkipByDesign
 generic_methods_recursive_bound_test/03: Crash
-hello_dart_test: Skip # Incompatible flag: --compile_all
-implicit_closure_test: Skip # Incompatible flag: --use_slow_path
-instance_creation_in_function_annotation_test: SkipByDesign
-invocation_mirror2_test: SkipByDesign
-invocation_mirror_invoke_on2_test: SkipByDesign
-invocation_mirror_invoke_on_test: SkipByDesign
-issue21079_test: SkipByDesign
-main_not_a_function_test: Skip
-many_overridden_no_such_method_test: SkipByDesign
-mixin_illegal_super_use_test: Skip # Issues 24478 and 23773
-mixin_illegal_superclass_test: Skip # Issues 24478 and 23773
-no_main_test/01: Skip
-no_such_method_test: SkipByDesign
+instance/creation_in_function_annotation_test: SkipByDesign
+main/no_main_test/01: Skip
+main/not_a_function_test: Skip
+mixin/illegal_super_use_test: Skip # Issues 24478 and 23773
+mixin/illegal_superclass_test: Skip # Issues 24478 and 23773
+no_such_method/many_overridden_test.dart: SkipByDesign
+no_such_method/overridden_test: SkipByDesign
+no_such_method/test: SkipByDesign
 null_test/mirrors: Skip # Uses mirrors.
 null_test/none: SkipByDesign
-overridden_no_such_method_test: SkipByDesign
-redirecting_factory_reflection_test: SkipByDesign
-regress_13462_0_test: SkipByDesign
-regress_13462_1_test: SkipByDesign
-regress_18535_test: SkipByDesign
-regress_28255_test: SkipByDesign
+optimize/deopt_inlined_function_lazy_test: Skip # Incompatible flag: --deoptimize-alot
+redirecting/factory_reflection_test: SkipByDesign
+regress/regress13462_0_test: SkipByDesign
+regress/regress13462_1_test: SkipByDesign
+regress/regress18535_test: SkipByDesign
+regress/regress21079_test: SkipByDesign
+regress/regress28255_test: SkipByDesign
+unsorted/hello_dart_test: Skip # Incompatible flag: --compile_all
+unsorted/invocation_mirror2_test: SkipByDesign
+unsorted/invocation_mirror_invoke_on2_test: SkipByDesign
+unsorted/invocation_mirror_invoke_on_test: SkipByDesign
 vm/causal_async_exception_stack2_test: SkipByDesign
 vm/causal_async_exception_stack_test: SkipByDesign
 vm/closure_memory_retention_test: Skip # KernelVM bug: Hits OOM
@@ -95,33 +95,33 @@ vm/regress_27671_test: Skip # Unsupported
 vm/regress_29145_test: Skip # Issue 29145
 
 [ $compiler == dartkp && $runtime == dart_precompiled && $checked ]
-assertion_initializer_const_error2_test/cc01: Crash
-assertion_initializer_const_error2_test/cc02: Crash
-assertion_initializer_const_error2_test/cc03: Crash
-assertion_initializer_const_error2_test/cc04: Crash
-assertion_initializer_const_error2_test/cc05: Crash
-assertion_initializer_const_error2_test/cc06: Crash
-assertion_initializer_const_error2_test/cc07: Crash
-assertion_initializer_const_error2_test/cc08: Crash
-assertion_initializer_const_error2_test/cc09: Crash
-assertion_initializer_const_error2_test/cc10: Crash
-assertion_initializer_const_error2_test/cc11: Crash
+assert/initializer_const_error2_test/cc01: Crash
+assert/initializer_const_error2_test/cc02: Crash
+assert/initializer_const_error2_test/cc03: Crash
+assert/initializer_const_error2_test/cc04: Crash
+assert/initializer_const_error2_test/cc05: Crash
+assert/initializer_const_error2_test/cc06: Crash
+assert/initializer_const_error2_test/cc07: Crash
+assert/initializer_const_error2_test/cc08: Crash
+assert/initializer_const_error2_test/cc09: Crash
+assert/initializer_const_error2_test/cc10: Crash
+assert/initializer_const_error2_test/cc11: Crash
 
 [ $compiler == dartkp && $system == windows ]
-disassemble_test: Slow
+unsorted/disassemble_test: Slow
 
 [ $mode == debug && $runtime == vm && ($compiler == app_jitk || $compiler == dartk || $compiler == dartkb) ]
-deopt_inlined_function_lazy_test: Skip
+optimize/deopt_inlined_function_lazy_test: Skip
 
 [ $mode == debug && $hot_reload && ($compiler == dartk || $compiler == dartkb) ]
-async_star_test/01: Crash
-async_star_test/05: Crash
+async_star/async_star2_test/01: Crash
+async_star/async_star2_test/05: Crash
 
 [ $mode == debug && ($compiler == dartk || $compiler == dartkb) && ($hot_reload || $hot_reload_rollback) ]
-enum_duplicate_test/02: Crash # Issue 34606
-enum_duplicate_test/none: Crash # Issue 34606
-enum_private_test/01: Crash # Issue 34606
-enum_test: Crash # Issue 34606
+enum/duplicate_test/02: Crash # Issue 34606
+enum/duplicate_test/none: Crash # Issue 34606
+enum/private_test/01: Crash # Issue 34606
+enum/test: Crash # Issue 34606
 
 [ $mode == product && $runtime == vm && ($compiler == dartk || $compiler == dartkb) ]
 vm/causal_async_exception_stack2_test: SkipByDesign
@@ -129,24 +129,23 @@ vm/causal_async_exception_stack_test: SkipByDesign
 
 # ===== dartk + vm status lines =====
 [ $runtime == vm && ($compiler == dartk || $compiler == dartkb) ]
-ct_const2_test: Crash # Flaky
-disassemble_test: Slow, Crash # dartbug.com/34971
-mixin_illegal_super_use_test: Skip # Issues 24478 and 23773
-mixin_illegal_superclass_test: Skip # Issues 24478 and 23773
-no_main_test/01: Skip
+const/const2_test: Crash # Flaky
+main/no_main_test/01: Skip
+mixin/illegal_super_use_test: Skip # Issues 24478 and 23773
+mixin/illegal_superclass_test: Skip # Issues 24478 and 23773
+unsorted/disassemble_test: Slow, Crash # dartbug.com/34971
 vm/closure_memory_retention_test: Skip # KernelVM bug: Hits OOM
 vm/regress_29145_test: Skip # Issue 29145
 web_int_literals_test/*: SkipByDesign # Test applies only to JavaScript targets
 
 [ $hot_reload_rollback && ($compiler == dartk || $compiler == dartkb) ]
-symbol_conflict_test: Slow
+symbol/conflict_test: Slow
 
 [ ($compiler == dartk || $compiler == dartkb) && ($hot_reload || $hot_reload_rollback) ]
-async_star_test/01: Skip # Timeout
-async_star_test/02: Skip # Timeout
-async_star_test/03: Skip # Timeout
-async_star_test/04: Skip # Timeout
-async_star_test/05: Skip # Timeout
-async_star_test/none: Skip # Timeout
+async_star/async_star2_test/01: Skip # Timeout
+async_star/async_star2_test/02: Skip # Timeout
+async_star/async_star2_test/03: Skip # Timeout
+async_star/async_star2_test/04: Skip # Timeout
+async_star/async_star2_test/05: Skip # Timeout
+async_star/async_star2_test/none: Skip # Timeout
 type_constants_test/none: Skip # Deferred libraries and hot reload.
-
diff --git a/tests/language_2/language_2_precompiled.status b/tests/language_2/language_2_precompiled.status
index d7e999b0bb5..3100f764443 100644
--- a/tests/language_2/language_2_precompiled.status
+++ b/tests/language_2/language_2_precompiled.status
@@ -4,14 +4,14 @@
 # Sections in this file should start with "$runtime == dart_precompiled".
 
 [ $arch == arm64 && $runtime == dart_precompiled ]
-large_class_declaration_test: SkipSlow # Uses too much memory.
-setter4_test: MissingCompileTimeError
+class/large_class_declaration_test: SkipSlow # Uses too much memory.
+setter/setter4_test: MissingCompileTimeError
 
 [ $arch == ia32 && $runtime == dart_precompiled ]
 vm/regress_24517_test: Pass, Fail # Issue 24517.
 
 [ $compiler != dart2analyzer && $runtime == dart_precompiled ]
-mixin_mixin2_test: Skip
+mixin/mixin2_test: Skip
 
 [ $compiler == dartkp && $runtime == dart_precompiled ]
 async_star/async_star_await_for_test: RuntimeError
@@ -19,26 +19,26 @@ async_star/async_star_cancel_test: RuntimeError
 async_star/async_star_test: RuntimeError
 
 [ $runtime == dart_precompiled && $minified ]
-cyclic_type_test/*: Skip
-enum_duplicate_test/*: Skip # Uses Enum.toString()
-enum_private_test/*: Skip # Uses Enum.toString()
-enum_test: Skip # Uses Enum.toString()
-full_stacktrace1_test: Skip
-full_stacktrace2_test: Skip
-full_stacktrace3_test: Skip
-mixin_generic_test: Skip
-mixin_mixin3_test: Skip
-mixin_mixin5_test: Skip
-mixin_mixin6_test: Skip
-mixin_mixin_bound2_test: Skip
-mixin_mixin_type_arguments_test: Skip
-mixin_super_2_test: Skip
-no_such_method_dispatcher_test: Skip # Uses new Symbol()
+enum/duplicate_test/*: Skip # Uses Enum.toString()
+enum/enum_test: Skip # Uses Enum.toString()
+enum/private_test/*: Skip # Uses Enum.toString()
+mixin/generic_test: Skip
+mixin/mixin3_test: Skip
+mixin/mixin5_test: Skip
+mixin/mixin6_test: Skip
+mixin/mixin_bound2_test: Skip
+mixin/mixin_type_arguments_test: Skip
+mixin/super_2_test: Skip
+no_such_method/dispatcher_test: Skip # Uses new Symbol()
+stack_trace/full1_test: Skip
+stack_trace/full2_test: Skip
+stack_trace/full3_test: Skip
+unsorted/cyclic_type_test/*: Skip
 vm/no_such_args_error_message_vm_test: Skip
 vm/no_such_method_error_message_callable_vm_test: Skip
 vm/no_such_method_error_message_vm_test: Skip
 vm/regress_28325_test: Skip
 
 [ $runtime == dart_precompiled && ($mode == product || $minified) ]
-stacktrace_rethrow_error_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
-stacktrace_rethrow_nonerror_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
+stack_trace/rethrow_error_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
+stack_trace/rethrow_nonerror_test: SkipByDesign # obfuscation/minification and instruction deduplication cause names of frames to be mangled (expected)
diff --git a/tests/language_2/language_2_spec_parser.status b/tests/language_2/language_2_spec_parser.status
index 8ba505126c0..6b5318d7ca3 100644
--- a/tests/language_2/language_2_spec_parser.status
+++ b/tests/language_2/language_2_spec_parser.status
@@ -3,16 +3,16 @@
 # BSD-style license that can be found in the LICENSE file.
 
 [ $compiler == spec_parser ]
-built_in_identifier_prefix_test: Skip # A built-in identifier can _not_ be a prefix.
-closure_type_test: Pass # Marked as RuntimeError for all in language_2.status.
-const_native_factory_test: Skip # Uses `native`.
-deep_nesting_expression_test: Skip # JVM stack overflow.
-deep_nesting_statement_test: Skip # JVM stack overflow.
-double_invalid_test: Skip # Contains illegaly formatted double.
-issue_1751477_test: Skip # Times out: 9 levels, exponential blowup => 430 secs.
-large_class_declaration_test: Skip # JVM stack overflow.
+class/large_class_declaration_test: Skip # JVM stack overflow.
+closure/type_test: Pass # Marked as RuntimeError for all in language_2.status.
+const/native_factory_test: Skip # Uses `native`.
+double/invalid_test: Skip # Contains illegaly formatted double.
+identifier/built_in_prefix_test: Skip # A built-in identifier can _not_ be a prefix.
 nnbd/syntax/opt_out_nnbd_modifiers_test: Skip # Requires opt-out of NNBD.
 nnbd/syntax/pre_nnbd_modifiers_test: Skip # Requires opt-out of NNBD.
+regress/regress1751477_test: Skip # Times out: 9 levels, exponential blowup => 430 secs.
+syntax/deep_nesting_expression_test: Skip # JVM stack overflow.
+syntax/deep_nesting_statement_test: Skip # JVM stack overflow.
 variance: Skip # Not yet supported.
 vm/debug_break_enabled_vm_test/01: Fail # Uses debug break.
 vm/debug_break_enabled_vm_test/none: Fail # Uses debug break.
diff --git a/tests/language_2/language_2_vm.status b/tests/language_2/language_2_vm.status
index ceb8ec6c591..2d01341af25 100644
--- a/tests/language_2/language_2_vm.status
+++ b/tests/language_2/language_2_vm.status
@@ -4,17 +4,17 @@
 # Sections in this file should contain "$runtime == vm".
 
 [ $compiler == dartkp ]
-assertion_initializer_const_error2_test/cc01: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc02: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc03: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc04: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc05: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc06: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc07: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc08: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc09: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc10: MissingCompileTimeError # Not reporting failed assert() at compile time.
-assertion_initializer_const_error2_test/cc11: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc01: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc02: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc03: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc04: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc05: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc06: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc07: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc08: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc09: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc10: MissingCompileTimeError # Not reporting failed assert() at compile time.
+assert/initializer_const_error2_test/cc11: MissingCompileTimeError # Not reporting failed assert() at compile time.
 
 [ $runtime == vm ]
 async_star/async_star_await_for_test: RuntimeError
@@ -22,11 +22,11 @@ async_star/async_star_cancel_test: RuntimeError
 async_star/async_star_test: RuntimeError
 
 [ $arch == arm64 && $runtime == vm ]
-closure_cycles_test: Pass, Slow
-large_class_declaration_test: SkipSlow # Uses too much memory.
+class/large_class_declaration_test: SkipSlow # Uses too much memory.
+closure/cycles_test: Pass, Slow
 
 [ $arch == ia32 && $mode == release && $runtime == vm ]
-deep_nesting_expression_test/01: Crash, Pass # Issue 31496
+syntax/deep_nesting_expression_test/01: Crash, Pass # Issue 31496
 
 [ $runtime == dart_precompiled || $runtime == vm ]
 superinterface_variance/*: Skip # Issue dart-lang/language#113
diff --git a/tests/language_2/lazy_map_test.dart b/tests/language_2/lazy/map_test.dart
similarity index 100%
rename from tests/language_2/lazy_map_test.dart
rename to tests/language_2/lazy/map_test.dart
diff --git a/tests/language_2/lazy_static2_test.dart b/tests/language_2/lazy/static2_test.dart
similarity index 100%
rename from tests/language_2/lazy_static2_test.dart
rename to tests/language_2/lazy/static2_test.dart
diff --git a/tests/language_2/lazy_static3_test.dart b/tests/language_2/lazy/static3_test.dart
similarity index 100%
rename from tests/language_2/lazy_static3_test.dart
rename to tests/language_2/lazy/static3_test.dart
diff --git a/tests/language_2/lazy_static4_test.dart b/tests/language_2/lazy/static4_test.dart
similarity index 100%
rename from tests/language_2/lazy_static4_test.dart
rename to tests/language_2/lazy/static4_test.dart
diff --git a/tests/language_2/lazy_static5_test.dart b/tests/language_2/lazy/static5_test.dart
similarity index 100%
rename from tests/language_2/lazy_static5_test.dart
rename to tests/language_2/lazy/static5_test.dart
diff --git a/tests/language_2/lazy_static6_src.dart b/tests/language_2/lazy/static6_src.dart
similarity index 100%
rename from tests/language_2/lazy_static6_src.dart
rename to tests/language_2/lazy/static6_src.dart
diff --git a/tests/language_2/lazy_static6_test.dart b/tests/language_2/lazy/static6_test.dart
similarity index 90%
rename from tests/language_2/lazy_static6_test.dart
rename to tests/language_2/lazy/static6_test.dart
index 398d3b43f5c..61c309ad513 100644
--- a/tests/language_2/lazy_static6_test.dart
+++ b/tests/language_2/lazy/static6_test.dart
@@ -4,4 +4,4 @@
 library lazy_static6_test;
 
 import "package:expect/expect.dart";
-part "lazy_static6_src.dart";
+part "static6_src.dart";
diff --git a/tests/language_2/lazy_static7_test.dart b/tests/language_2/lazy/static7_test.dart
similarity index 100%
rename from tests/language_2/lazy_static7_test.dart
rename to tests/language_2/lazy/static7_test.dart
diff --git a/tests/language_2/lazy_static8_test.dart b/tests/language_2/lazy/static8_test.dart
similarity index 100%
rename from tests/language_2/lazy_static8_test.dart
rename to tests/language_2/lazy/static8_test.dart
diff --git a/tests/language_2/lazy_static_test.dart b/tests/language_2/lazy/static_test.dart
similarity index 100%
rename from tests/language_2/lazy_static_test.dart
rename to tests/language_2/lazy/static_test.dart
diff --git a/tests/language_2/throwing_lazy_variable_test.dart b/tests/language_2/lazy/throwing_variable_test.dart
similarity index 100%
rename from tests/language_2/throwing_lazy_variable_test.dart
rename to tests/language_2/lazy/throwing_variable_test.dart
diff --git a/tests/language_2/least_upper_bound_expansive_runtime_test.dart b/tests/language_2/least_upper_bound/expansive_runtime_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_expansive_runtime_test.dart
rename to tests/language_2/least_upper_bound/expansive_runtime_test.dart
diff --git a/tests/language_2/least_upper_bound_expansive_test.dart b/tests/language_2/least_upper_bound/expansive_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_expansive_test.dart
rename to tests/language_2/least_upper_bound/expansive_test.dart
diff --git a/tests/language_2/least_upper_bound_test.dart b/tests/language_2/least_upper_bound/least_upper_bound_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_test.dart
rename to tests/language_2/least_upper_bound/least_upper_bound_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_10_test.dart b/tests/language_2/least_upper_bound/runtime_10_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_10_test.dart
rename to tests/language_2/least_upper_bound/runtime_10_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_11_test.dart b/tests/language_2/least_upper_bound/runtime_11_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_11_test.dart
rename to tests/language_2/least_upper_bound/runtime_11_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_12_test.dart b/tests/language_2/least_upper_bound/runtime_12_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_12_test.dart
rename to tests/language_2/least_upper_bound/runtime_12_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_13_test.dart b/tests/language_2/least_upper_bound/runtime_13_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_13_test.dart
rename to tests/language_2/least_upper_bound/runtime_13_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_14_test.dart b/tests/language_2/least_upper_bound/runtime_14_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_14_test.dart
rename to tests/language_2/least_upper_bound/runtime_14_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_15_test.dart b/tests/language_2/least_upper_bound/runtime_15_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_15_test.dart
rename to tests/language_2/least_upper_bound/runtime_15_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_16_test.dart b/tests/language_2/least_upper_bound/runtime_16_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_16_test.dart
rename to tests/language_2/least_upper_bound/runtime_16_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_17_test.dart b/tests/language_2/least_upper_bound/runtime_17_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_17_test.dart
rename to tests/language_2/least_upper_bound/runtime_17_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_18_test.dart b/tests/language_2/least_upper_bound/runtime_18_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_18_test.dart
rename to tests/language_2/least_upper_bound/runtime_18_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_19_test.dart b/tests/language_2/least_upper_bound/runtime_19_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_19_test.dart
rename to tests/language_2/least_upper_bound/runtime_19_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_1_test.dart b/tests/language_2/least_upper_bound/runtime_1_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_1_test.dart
rename to tests/language_2/least_upper_bound/runtime_1_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_20_test.dart b/tests/language_2/least_upper_bound/runtime_20_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_20_test.dart
rename to tests/language_2/least_upper_bound/runtime_20_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_21_test.dart b/tests/language_2/least_upper_bound/runtime_21_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_21_test.dart
rename to tests/language_2/least_upper_bound/runtime_21_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_22_test.dart b/tests/language_2/least_upper_bound/runtime_22_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_22_test.dart
rename to tests/language_2/least_upper_bound/runtime_22_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_2_test.dart b/tests/language_2/least_upper_bound/runtime_2_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_2_test.dart
rename to tests/language_2/least_upper_bound/runtime_2_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_3_test.dart b/tests/language_2/least_upper_bound/runtime_3_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_3_test.dart
rename to tests/language_2/least_upper_bound/runtime_3_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_4_test.dart b/tests/language_2/least_upper_bound/runtime_4_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_4_test.dart
rename to tests/language_2/least_upper_bound/runtime_4_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_5_test.dart b/tests/language_2/least_upper_bound/runtime_5_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_5_test.dart
rename to tests/language_2/least_upper_bound/runtime_5_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_6_test.dart b/tests/language_2/least_upper_bound/runtime_6_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_6_test.dart
rename to tests/language_2/least_upper_bound/runtime_6_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_7_test.dart b/tests/language_2/least_upper_bound/runtime_7_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_7_test.dart
rename to tests/language_2/least_upper_bound/runtime_7_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_8_test.dart b/tests/language_2/least_upper_bound/runtime_8_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_8_test.dart
rename to tests/language_2/least_upper_bound/runtime_8_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_9_test.dart b/tests/language_2/least_upper_bound/runtime_9_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_9_test.dart
rename to tests/language_2/least_upper_bound/runtime_9_test.dart
diff --git a/tests/language_2/least_upper_bound_runtime_test.dart b/tests/language_2/least_upper_bound/runtime_test.dart
similarity index 100%
rename from tests/language_2/least_upper_bound_runtime_test.dart
rename to tests/language_2/least_upper_bound/runtime_test.dart
diff --git a/tests/language_2/library_a.dart b/tests/language_2/library/a.dart
similarity index 91%
rename from tests/language_2/library_a.dart
rename to tests/language_2/library/a.dart
index e70b3aa41b0..95f855e7661 100644
--- a/tests/language_2/library_a.dart
+++ b/tests/language_2/library/a.dart
@@ -5,6 +5,6 @@
 
 library libraryA.dart;
 
-import "library_c.dart";
+import "c.dart";
 
 var fooA = fooC;
diff --git a/tests/language_2/library_ambiguous_test.dart b/tests/language_2/library/ambiguous_test.dart
similarity index 100%
rename from tests/language_2/library_ambiguous_test.dart
rename to tests/language_2/library/ambiguous_test.dart
diff --git a/tests/language_2/library_b.dart b/tests/language_2/library/b.dart
similarity index 91%
rename from tests/language_2/library_b.dart
rename to tests/language_2/library/b.dart
index 3cf954fe222..2a36a647d36 100644
--- a/tests/language_2/library_b.dart
+++ b/tests/language_2/library/b.dart
@@ -5,6 +5,6 @@
 
 library libraryB.dart;
 
-import "library_c.dart";
+import "c.dart";
 
 var fooB = fooC;
diff --git a/tests/language_2/library_c.dart b/tests/language_2/library/c.dart
similarity index 100%
rename from tests/language_2/library_c.dart
rename to tests/language_2/library/c.dart
diff --git a/tests/language_2/library_d.dart b/tests/language_2/library/d.dart
similarity index 91%
rename from tests/language_2/library_d.dart
rename to tests/language_2/library/d.dart
index fc1dd1b7690..054c0339083 100644
--- a/tests/language_2/library_d.dart
+++ b/tests/language_2/library/d.dart
@@ -5,6 +5,6 @@
 
 library libraryD.dart;
 
-import "library_f.dart";
+import "f.dart";
 
 var fooD = fooC;
diff --git a/tests/language_2/library_e.dart b/tests/language_2/library/e.dart
similarity index 83%
rename from tests/language_2/library_e.dart
rename to tests/language_2/library/e.dart
index 41ff146a649..0332e42cd1e 100644
--- a/tests/language_2/library_e.dart
+++ b/tests/language_2/library/e.dart
@@ -5,7 +5,7 @@
 
 library libraryE.dart;
 
-import "library_c.dart";
-import "library_f.dart";
+import "c.dart";
+import "f.dart";
 
 var fooE = 0;
diff --git a/tests/language_2/library_env_test.dart b/tests/language_2/library/env_test.dart
similarity index 100%
rename from tests/language_2/library_env_test.dart
rename to tests/language_2/library/env_test.dart
diff --git a/tests/language_2/library_f.dart b/tests/language_2/library/f.dart
similarity index 100%
rename from tests/language_2/library_f.dart
rename to tests/language_2/library/f.dart
diff --git a/tests/language_2/library_juxtaposition_lib.dart b/tests/language_2/library/juxtaposition_lib.dart
similarity index 83%
rename from tests/language_2/library_juxtaposition_lib.dart
rename to tests/language_2/library/juxtaposition_lib.dart
index 93f669173dc..bf1230af4ed 100644
--- a/tests/language_2/library_juxtaposition_lib.dart
+++ b/tests/language_2/library/juxtaposition_lib.dart
@@ -4,4 +4,4 @@
 
 library lib;
 
-part "library_" "juxtaposition_" "part.dart";
+part "" "juxtaposition_" "part.dart";
diff --git a/tests/language_2/library_juxtaposition_part.dart b/tests/language_2/library/juxtaposition_part.dart
similarity index 100%
rename from tests/language_2/library_juxtaposition_part.dart
rename to tests/language_2/library/juxtaposition_part.dart
diff --git a/tests/language_2/library_juxtaposition_test.dart b/tests/language_2/library/juxtaposition_test.dart
similarity index 75%
rename from tests/language_2/library_juxtaposition_test.dart
rename to tests/language_2/library/juxtaposition_test.dart
index aad08ac4940..be49df39b2b 100644
--- a/tests/language_2/library_juxtaposition_test.dart
+++ b/tests/language_2/library/juxtaposition_test.dart
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import "library_" "juxtaposition_" "lib.dart";
-export "library_" "juxtaposition_" "lib.dart";
+import "" "juxtaposition_" "lib.dart";
+export "" "juxtaposition_" "lib.dart";
 
 main() {
   Expect.equals(c, 47);
diff --git a/tests/language_2/library/library1.dart b/tests/language_2/library/library1.dart
new file mode 100644
index 00000000000..96cdd1bfe75
--- /dev/null
+++ b/tests/language_2/library/library1.dart
@@ -0,0 +1,18 @@
+// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+//
+
+library library1.dart;
+
+var foo;
+
+bar() => "library1.dart bar()";
+
+baz() => "library1.dart baz()";
+
+var bay;
+
+typedef int bax(int a, int b);
+
+class baw {}
diff --git a/tests/language_2/library1_lib.dart b/tests/language_2/library/library1_lib.dart
similarity index 100%
rename from tests/language_2/library1_lib.dart
rename to tests/language_2/library/library1_lib.dart
diff --git a/tests/language_2/library1_test.dart b/tests/language_2/library/library1_test.dart
similarity index 100%
rename from tests/language_2/library1_test.dart
rename to tests/language_2/library/library1_test.dart
diff --git a/tests/language_2/library/library2.dart b/tests/language_2/library/library2.dart
new file mode 100644
index 00000000000..219303f3688
--- /dev/null
+++ b/tests/language_2/library/library2.dart
@@ -0,0 +1,16 @@
+// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+var foo;
+var foo1 = 0;
+
+bar() => "library2.dart bar()";
+
+var baz;
+
+bay() => "library2.dart bay()";
+
+typedef double bax(int a, int b);
+
+var baw;
diff --git a/tests/language_2/library3.dart b/tests/language_2/library/library3.dart
similarity index 81%
rename from tests/language_2/library3.dart
rename to tests/language_2/library/library3.dart
index 9305f1e8869..625f568c458 100644
--- a/tests/language_2/library3.dart
+++ b/tests/language_2/library/library3.dart
@@ -5,4 +5,4 @@
 
 library library3.dart;
 
-import "library2.dart"; // defines "foo" and "foo1".
+import "../library2.dart"; // defines "foo" and "foo1".
diff --git a/tests/language_2/library4.dart b/tests/language_2/library/library4.dart
similarity index 82%
rename from tests/language_2/library4.dart
rename to tests/language_2/library/library4.dart
index 0571c73f0af..25af0117371 100644
--- a/tests/language_2/library4.dart
+++ b/tests/language_2/library/library4.dart
@@ -5,7 +5,7 @@
 
 library library4.dart;
 
-import "library2.dart"; // defines "foo" and "foo1".
+import "../library2.dart"; // defines "foo" and "foo1".
 
 var foo;
 var foo1 = 0;
diff --git a/tests/language_2/library5_test.dart b/tests/language_2/library/library5_test.dart
similarity index 100%
rename from tests/language_2/library5_test.dart
rename to tests/language_2/library/library5_test.dart
diff --git a/tests/language_2/library5a.dart b/tests/language_2/library/library5a.dart
similarity index 100%
rename from tests/language_2/library5a.dart
rename to tests/language_2/library/library5a.dart
diff --git a/tests/language_2/library5b.dart b/tests/language_2/library/library5b.dart
similarity index 100%
rename from tests/language_2/library5b.dart
rename to tests/language_2/library/library5b.dart
diff --git a/tests/language_2/library6.dart b/tests/language_2/library/library6.dart
similarity index 100%
rename from tests/language_2/library6.dart
rename to tests/language_2/library/library6.dart
diff --git a/tests/language_2/library_test.dart b/tests/language_2/library/library_test.dart
similarity index 100%
rename from tests/language_2/library_test.dart
rename to tests/language_2/library/library_test.dart
diff --git a/tests/language_2/library_prefixes.dart b/tests/language_2/library/prefixes.dart
similarity index 95%
rename from tests/language_2/library_prefixes.dart
rename to tests/language_2/library/prefixes.dart
index 0f0a97ffde6..fee5b6e81a0 100644
--- a/tests/language_2/library_prefixes.dart
+++ b/tests/language_2/library/prefixes.dart
@@ -4,8 +4,8 @@
 
 library LibraryPrefixes.lib;
 
-import "library_prefixes_test1.dart";
-import "library_prefixes_test2.dart" as other;
+import "prefixes_test1.dart";
+import "prefixes_test2.dart" as other;
 
 class LibraryPrefixes {
   static void main(var expectEquals) {
diff --git a/tests/language_2/library_prefixes_test.dart b/tests/language_2/library/prefixes_test.dart
similarity index 93%
rename from tests/language_2/library_prefixes_test.dart
rename to tests/language_2/library/prefixes_test.dart
index 7c508c2bd18..4ffef88a5e2 100644
--- a/tests/language_2/library_prefixes_test.dart
+++ b/tests/language_2/library/prefixes_test.dart
@@ -5,7 +5,7 @@
 library LibraryPrefixesTest.dart;
 
 import "package:expect/expect.dart";
-import "library_prefixes.dart";
+import "prefixes.dart";
 
 class LibraryPrefixesTest {
   static testMain() {
diff --git a/tests/language_2/library_prefixes_test1.dart b/tests/language_2/library/prefixes_test1.dart
similarity index 100%
rename from tests/language_2/library_prefixes_test1.dart
rename to tests/language_2/library/prefixes_test1.dart
diff --git a/tests/language_2/library_prefixes_test2.dart b/tests/language_2/library/prefixes_test2.dart
similarity index 100%
rename from tests/language_2/library_prefixes_test2.dart
rename to tests/language_2/library/prefixes_test2.dart
diff --git a/tests/language_2/library_private_in_constructor_a.dart b/tests/language_2/library/private_in_constructor_a.dart
similarity index 100%
rename from tests/language_2/library_private_in_constructor_a.dart
rename to tests/language_2/library/private_in_constructor_a.dart
diff --git a/tests/language_2/library_private_in_constructor_b.dart b/tests/language_2/library/private_in_constructor_b.dart
similarity index 89%
rename from tests/language_2/library_private_in_constructor_b.dart
rename to tests/language_2/library/private_in_constructor_b.dart
index 06ca0bb8e81..44183722423 100644
--- a/tests/language_2/library_private_in_constructor_b.dart
+++ b/tests/language_2/library/private_in_constructor_b.dart
@@ -4,7 +4,7 @@
 
 library LibraryPrivateInConstructorB;
 
-import "library_private_in_constructor_a.dart";
+import "private_in_constructor_a.dart";
 
 class PrivateB {
   const PrivateB();
diff --git a/tests/language_2/library_private_in_constructor_test.dart b/tests/language_2/library/private_in_constructor_test.dart
similarity index 79%
rename from tests/language_2/library_private_in_constructor_test.dart
rename to tests/language_2/library/private_in_constructor_test.dart
index 586e7c2df01..f62563ad77a 100644
--- a/tests/language_2/library_private_in_constructor_test.dart
+++ b/tests/language_2/library/private_in_constructor_test.dart
@@ -5,8 +5,8 @@
 library LibraryPrivateInConstructor;
 
 import "package:expect/expect.dart";
-import "library_private_in_constructor_a.dart";
-import "library_private_in_constructor_b.dart";
+import "private_in_constructor_a.dart";
+import "private_in_constructor_b.dart";
 
 main() {
   var b = new B();
diff --git a/tests/language_2/library_same_name_used_lib1.dart b/tests/language_2/library/same_name_used_lib1.dart
similarity index 85%
rename from tests/language_2/library_same_name_used_lib1.dart
rename to tests/language_2/library/same_name_used_lib1.dart
index c2fdbcc6a6e..3a93459a439 100644
--- a/tests/language_2/library_same_name_used_lib1.dart
+++ b/tests/language_2/library/same_name_used_lib1.dart
@@ -4,7 +4,7 @@
 
 library lib1;
 
-import 'library_same_name_used_lib2.dart' as lib2;
+import 'same_name_used_lib2.dart' as lib2;
 
 abstract class X {}
 
diff --git a/tests/language_2/library_same_name_used_lib2.dart b/tests/language_2/library/same_name_used_lib2.dart
similarity index 79%
rename from tests/language_2/library_same_name_used_lib2.dart
rename to tests/language_2/library/same_name_used_lib2.dart
index 10787378104..7d8c8a8e8c2 100644
--- a/tests/language_2/library_same_name_used_lib2.dart
+++ b/tests/language_2/library/same_name_used_lib2.dart
@@ -4,7 +4,7 @@
 
 library lib2;
 
-import 'library_same_name_used_lib1.dart' as lib1; // for abstract class X.
+import 'same_name_used_lib1.dart' as lib1; // for abstract class X.
 
 class X implements lib1.X {
   X();
diff --git a/tests/language_2/library_same_name_used_test.dart b/tests/language_2/library/same_name_used_test.dart
similarity index 91%
rename from tests/language_2/library_same_name_used_test.dart
rename to tests/language_2/library/same_name_used_test.dart
index ee743b2c179..74779f9ce90 100644
--- a/tests/language_2/library_same_name_used_test.dart
+++ b/tests/language_2/library/same_name_used_test.dart
@@ -8,7 +8,7 @@
 library main;
 
 import "package:expect/expect.dart";
-import "library_same_name_used_lib1.dart";
+import "same_name_used_lib1.dart";
 
 main() {
   var x = makeX();
diff --git a/tests/language_2/list_double_index_in_loop2_test.dart b/tests/language_2/list/double_index_in_loop2_test.dart
similarity index 100%
rename from tests/language_2/list_double_index_in_loop2_test.dart
rename to tests/language_2/list/double_index_in_loop2_test.dart
diff --git a/tests/language_2/list_double_index_in_loop_test.dart b/tests/language_2/list/double_index_in_loop_test.dart
similarity index 100%
rename from tests/language_2/list_double_index_in_loop_test.dart
rename to tests/language_2/list/double_index_in_loop_test.dart
diff --git a/tests/language_2/list_in_closure_test.dart b/tests/language_2/list/in_closure_test.dart
similarity index 100%
rename from tests/language_2/list_in_closure_test.dart
rename to tests/language_2/list/in_closure_test.dart
diff --git a/tests/language_2/list_is_test.dart b/tests/language_2/list/is_test.dart
similarity index 100%
rename from tests/language_2/list_is_test.dart
rename to tests/language_2/list/is_test.dart
diff --git a/tests/language_2/list_length_tracer_test.dart b/tests/language_2/list/length_tracer_test.dart
similarity index 100%
rename from tests/language_2/list_length_tracer_test.dart
rename to tests/language_2/list/length_tracer_test.dart
diff --git a/tests/language_2/list_test.dart b/tests/language_2/list/list_test.dart
similarity index 100%
rename from tests/language_2/list_test.dart
rename to tests/language_2/list/list_test.dart
diff --git a/tests/language_2/list_literal1_runtime_test.dart b/tests/language_2/list/literal1_runtime_test.dart
similarity index 100%
rename from tests/language_2/list_literal1_runtime_test.dart
rename to tests/language_2/list/literal1_runtime_test.dart
diff --git a/tests/language_2/list_literal1_test.dart b/tests/language_2/list/literal1_test.dart
similarity index 100%
rename from tests/language_2/list_literal1_test.dart
rename to tests/language_2/list/literal1_test.dart
diff --git a/tests/language_2/list_literal2_test.dart b/tests/language_2/list/literal2_test.dart
similarity index 100%
rename from tests/language_2/list_literal2_test.dart
rename to tests/language_2/list/literal2_test.dart
diff --git a/tests/language_2/list_literal3_test.dart b/tests/language_2/list/literal3_test.dart
similarity index 100%
rename from tests/language_2/list_literal3_test.dart
rename to tests/language_2/list/literal3_test.dart
diff --git a/tests/language_2/list_literal4_test.dart b/tests/language_2/list/literal4_test.dart
similarity index 100%
rename from tests/language_2/list_literal4_test.dart
rename to tests/language_2/list/literal4_test.dart
diff --git a/tests/language_2/list_literal5_test.dart b/tests/language_2/list/literal5_test.dart
similarity index 100%
rename from tests/language_2/list_literal5_test.dart
rename to tests/language_2/list/literal5_test.dart
diff --git a/tests/language_2/list_literal6_test.dart b/tests/language_2/list/literal6_test.dart
similarity index 100%
rename from tests/language_2/list_literal6_test.dart
rename to tests/language_2/list/literal6_test.dart
diff --git a/tests/language_2/list_literal_syntax_test.dart b/tests/language_2/list/literal_syntax_test.dart
similarity index 100%
rename from tests/language_2/list_literal_syntax_test.dart
rename to tests/language_2/list/literal_syntax_test.dart
diff --git a/tests/language_2/list_literal_test.dart b/tests/language_2/list/literal_test.dart
similarity index 100%
rename from tests/language_2/list_literal_test.dart
rename to tests/language_2/list/literal_test.dart
diff --git a/tests/language_2/list_mixin_test.dart b/tests/language_2/list/mixin_test.dart
similarity index 100%
rename from tests/language_2/list_mixin_test.dart
rename to tests/language_2/list/mixin_test.dart
diff --git a/tests/language_2/list_tracer_call_last_test.dart b/tests/language_2/list/tracer_call_last_test.dart
similarity index 100%
rename from tests/language_2/list_tracer_call_last_test.dart
rename to tests/language_2/list/tracer_call_last_test.dart
diff --git a/tests/language_2/list_tracer_closure_test.dart b/tests/language_2/list/tracer_closure_test.dart
similarity index 100%
rename from tests/language_2/list_tracer_closure_test.dart
rename to tests/language_2/list/tracer_closure_test.dart
diff --git a/tests/language_2/list_tracer_in_list_test.dart b/tests/language_2/list/tracer_in_list_test.dart
similarity index 100%
rename from tests/language_2/list_tracer_in_list_test.dart
rename to tests/language_2/list/tracer_in_list_test.dart
diff --git a/tests/language_2/list_tracer_in_map_test.dart b/tests/language_2/list/tracer_in_map_test.dart
similarity index 100%
rename from tests/language_2/list_tracer_in_map_test.dart
rename to tests/language_2/list/tracer_in_map_test.dart
diff --git a/tests/language_2/list_tracer_return_from_tearoff_closure_test.dart b/tests/language_2/list/tracer_return_from_tearoff_closure_test.dart
similarity index 100%
rename from tests/language_2/list_tracer_return_from_tearoff_closure_test.dart
rename to tests/language_2/list/tracer_return_from_tearoff_closure_test.dart
diff --git a/tests/language_2/break_outside_loop_runtime_test.dart b/tests/language_2/loop/break_outside_loop_runtime_test.dart
similarity index 100%
rename from tests/language_2/break_outside_loop_runtime_test.dart
rename to tests/language_2/loop/break_outside_loop_runtime_test.dart
diff --git a/tests/language_2/break_outside_loop_test.dart b/tests/language_2/loop/break_outside_loop_test.dart
similarity index 100%
rename from tests/language_2/break_outside_loop_test.dart
rename to tests/language_2/loop/break_outside_loop_test.dart
diff --git a/tests/language_2/break_test.dart b/tests/language_2/loop/break_test.dart
similarity index 100%
rename from tests/language_2/break_test.dart
rename to tests/language_2/loop/break_test.dart
diff --git a/tests/language_2/continue_test.dart b/tests/language_2/loop/continue_test.dart
similarity index 100%
rename from tests/language_2/continue_test.dart
rename to tests/language_2/loop/continue_test.dart
diff --git a/tests/language_2/do_while2_test.dart b/tests/language_2/loop/do_while2_test.dart
similarity index 100%
rename from tests/language_2/do_while2_test.dart
rename to tests/language_2/loop/do_while2_test.dart
diff --git a/tests/language_2/do_while3_test.dart b/tests/language_2/loop/do_while3_test.dart
similarity index 100%
rename from tests/language_2/do_while3_test.dart
rename to tests/language_2/loop/do_while3_test.dart
diff --git a/tests/language_2/do_while4_test.dart b/tests/language_2/loop/do_while4_test.dart
similarity index 100%
rename from tests/language_2/do_while4_test.dart
rename to tests/language_2/loop/do_while4_test.dart
diff --git a/tests/language_2/do_while_test.dart b/tests/language_2/loop/do_while_test.dart
similarity index 100%
rename from tests/language_2/do_while_test.dart
rename to tests/language_2/loop/do_while_test.dart
diff --git a/tests/language_2/loop_exchange2_test.dart b/tests/language_2/loop/exchange2_test.dart
similarity index 100%
rename from tests/language_2/loop_exchange2_test.dart
rename to tests/language_2/loop/exchange2_test.dart
diff --git a/tests/language_2/loop_exchange3_test.dart b/tests/language_2/loop/exchange3_test.dart
similarity index 100%
rename from tests/language_2/loop_exchange3_test.dart
rename to tests/language_2/loop/exchange3_test.dart
diff --git a/tests/language_2/loop_exchange4_test.dart b/tests/language_2/loop/exchange4_test.dart
similarity index 100%
rename from tests/language_2/loop_exchange4_test.dart
rename to tests/language_2/loop/exchange4_test.dart
diff --git a/tests/language_2/loop_exchange_test.dart b/tests/language_2/loop/exchange_loop_exchange_test.dart
similarity index 100%
rename from tests/language_2/loop_exchange_test.dart
rename to tests/language_2/loop/exchange_loop_exchange_test.dart
diff --git a/tests/language_2/exhaustive_for_test.dart b/tests/language_2/loop/exhaustive_for_test.dart
similarity index 100%
rename from tests/language_2/exhaustive_for_test.dart
rename to tests/language_2/loop/exhaustive_for_test.dart
diff --git a/tests/language_2/for2_test.dart b/tests/language_2/loop/for2_test.dart
similarity index 100%
rename from tests/language_2/for2_test.dart
rename to tests/language_2/loop/for2_test.dart
diff --git a/tests/language_2/for_in2_test.dart b/tests/language_2/loop/for_in2_test.dart
similarity index 100%
rename from tests/language_2/for_in2_test.dart
rename to tests/language_2/loop/for_in2_test.dart
diff --git a/tests/language_2/for_in3_test.dart b/tests/language_2/loop/for_in3_test.dart
similarity index 100%
rename from tests/language_2/for_in3_test.dart
rename to tests/language_2/loop/for_in3_test.dart
diff --git a/tests/language_2/for_in_side_effects_test.dart b/tests/language_2/loop/for_in_side_effects_test.dart
similarity index 100%
rename from tests/language_2/for_in_side_effects_test.dart
rename to tests/language_2/loop/for_in_side_effects_test.dart
diff --git a/tests/language_2/for_in_test.dart b/tests/language_2/loop/for_in_test.dart
similarity index 100%
rename from tests/language_2/for_in_test.dart
rename to tests/language_2/loop/for_in_test.dart
diff --git a/tests/language_2/for_inlining_test.dart b/tests/language_2/loop/for_inlining_test.dart
similarity index 100%
rename from tests/language_2/for_inlining_test.dart
rename to tests/language_2/loop/for_inlining_test.dart
diff --git a/tests/language_2/for_runtime_test.dart b/tests/language_2/loop/for_runtime_test.dart
similarity index 100%
rename from tests/language_2/for_runtime_test.dart
rename to tests/language_2/loop/for_runtime_test.dart
diff --git a/tests/language_2/for_test.dart b/tests/language_2/loop/for_test.dart
similarity index 100%
rename from tests/language_2/for_test.dart
rename to tests/language_2/loop/for_test.dart
diff --git a/tests/language_2/for_variable_capture_test.dart b/tests/language_2/loop/for_variable_capture_test.dart
similarity index 100%
rename from tests/language_2/for_variable_capture_test.dart
rename to tests/language_2/loop/for_variable_capture_test.dart
diff --git a/tests/language_2/for_without_condition_test.dart b/tests/language_2/loop/for_without_condition_test.dart
similarity index 100%
rename from tests/language_2/for_without_condition_test.dart
rename to tests/language_2/loop/for_without_condition_test.dart
diff --git a/tests/language_2/loop_hoist_test.dart b/tests/language_2/loop/hoist_test.dart
similarity index 100%
rename from tests/language_2/loop_hoist_test.dart
rename to tests/language_2/loop/hoist_test.dart
diff --git a/tests/language_2/non_dominating_loop_test.dart b/tests/language_2/loop/non_dominating_loop_test.dart
similarity index 100%
rename from tests/language_2/non_dominating_loop_test.dart
rename to tests/language_2/loop/non_dominating_loop_test.dart
diff --git a/tests/language_2/unconditional_break.dart b/tests/language_2/loop/unconditional_break_test.dart
similarity index 100%
rename from tests/language_2/unconditional_break.dart
rename to tests/language_2/loop/unconditional_break_test.dart
diff --git a/tests/language_2/while_test.dart b/tests/language_2/loop/while_test.dart
similarity index 100%
rename from tests/language_2/while_test.dart
rename to tests/language_2/loop/while_test.dart
diff --git a/tests/language_2/main_test.dart b/tests/language_2/main/main_test.dart
similarity index 100%
rename from tests/language_2/main_test.dart
rename to tests/language_2/main/main_test.dart
diff --git a/tests/language_2/no_main_test.dart b/tests/language_2/main/no_main_test.dart
similarity index 100%
rename from tests/language_2/no_main_test.dart
rename to tests/language_2/main/no_main_test.dart
diff --git a/tests/language_2/main_not_a_function_test.dart b/tests/language_2/main/not_a_function_test.dart
similarity index 100%
rename from tests/language_2/main_not_a_function_test.dart
rename to tests/language_2/main/not_a_function_test.dart
diff --git a/tests/language_2/malbounded_instantiation_runtime_test.dart b/tests/language_2/malbounded/instantiation_runtime_test.dart
similarity index 100%
rename from tests/language_2/malbounded_instantiation_runtime_test.dart
rename to tests/language_2/malbounded/instantiation_runtime_test.dart
diff --git a/tests/language_2/malbounded_instantiation_test.dart b/tests/language_2/malbounded/instantiation_test.dart
similarity index 100%
rename from tests/language_2/malbounded_instantiation_test.dart
rename to tests/language_2/malbounded/instantiation_test.dart
diff --git a/tests/language_2/malbounded_redirecting_factory_test.dart b/tests/language_2/malbounded/redirecting_factory_test.dart
similarity index 100%
rename from tests/language_2/malbounded_redirecting_factory_test.dart
rename to tests/language_2/malbounded/redirecting_factory_test.dart
diff --git a/tests/language_2/malbounded_type_cast2_test.dart b/tests/language_2/malbounded/type_cast2_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_cast2_test.dart
rename to tests/language_2/malbounded/type_cast2_test.dart
diff --git a/tests/language_2/malbounded_type_cast_runtime_test.dart b/tests/language_2/malbounded/type_cast_runtime_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_cast_runtime_test.dart
rename to tests/language_2/malbounded/type_cast_runtime_test.dart
diff --git a/tests/language_2/malbounded_type_cast_test.dart b/tests/language_2/malbounded/type_cast_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_cast_test.dart
rename to tests/language_2/malbounded/type_cast_test.dart
diff --git a/tests/language_2/malbounded_type_literal_runtime_test.dart b/tests/language_2/malbounded/type_literal_runtime_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_literal_runtime_test.dart
rename to tests/language_2/malbounded/type_literal_runtime_test.dart
diff --git a/tests/language_2/malbounded_type_literal_test.dart b/tests/language_2/malbounded/type_literal_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_literal_test.dart
rename to tests/language_2/malbounded/type_literal_test.dart
diff --git a/tests/language_2/malbounded_type_test2_runtime_test.dart b/tests/language_2/malbounded/type_test2_runtime_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_test2_runtime_test.dart
rename to tests/language_2/malbounded/type_test2_runtime_test.dart
diff --git a/tests/language_2/malbounded_type_test2_test.dart b/tests/language_2/malbounded/type_test2_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_test2_test.dart
rename to tests/language_2/malbounded/type_test2_test.dart
diff --git a/tests/language_2/malbounded_type_test_runtime_test.dart b/tests/language_2/malbounded/type_test_runtime_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_test_runtime_test.dart
rename to tests/language_2/malbounded/type_test_runtime_test.dart
diff --git a/tests/language_2/malbounded_type_test_test.dart b/tests/language_2/malbounded/type_test_test.dart
similarity index 100%
rename from tests/language_2/malbounded_type_test_test.dart
rename to tests/language_2/malbounded/type_test_test.dart
diff --git a/tests/language_2/malformed_bound_test.dart b/tests/language_2/malformed/bound_test.dart
similarity index 100%
rename from tests/language_2/malformed_bound_test.dart
rename to tests/language_2/malformed/bound_test.dart
diff --git a/tests/language_2/malformed_inheritance_runtime_test.dart b/tests/language_2/malformed/inheritance_runtime_test.dart
similarity index 100%
rename from tests/language_2/malformed_inheritance_runtime_test.dart
rename to tests/language_2/malformed/inheritance_runtime_test.dart
diff --git a/tests/language_2/malformed_inheritance_test.dart b/tests/language_2/malformed/inheritance_test.dart
similarity index 100%
rename from tests/language_2/malformed_inheritance_test.dart
rename to tests/language_2/malformed/inheritance_test.dart
diff --git a/tests/language_2/malformed2_lib.dart b/tests/language_2/malformed/malformed2_lib.dart
similarity index 100%
rename from tests/language_2/malformed2_lib.dart
rename to tests/language_2/malformed/malformed2_lib.dart
diff --git a/tests/language_2/malformed2_test.dart b/tests/language_2/malformed/malformed2_test.dart
similarity index 100%
rename from tests/language_2/malformed2_test.dart
rename to tests/language_2/malformed/malformed2_test.dart
diff --git a/tests/language_2/malformed_test.dart b/tests/language_2/malformed/malformed_test.dart
similarity index 100%
rename from tests/language_2/malformed_test.dart
rename to tests/language_2/malformed/malformed_test.dart
diff --git a/tests/language_2/malformed_runtime_test.dart b/tests/language_2/malformed/runtime_test.dart
similarity index 100%
rename from tests/language_2/malformed_runtime_test.dart
rename to tests/language_2/malformed/runtime_test.dart
diff --git a/tests/language_2/malformed_type_test.dart b/tests/language_2/malformed/type_test.dart
similarity index 100%
rename from tests/language_2/malformed_type_test.dart
rename to tests/language_2/malformed/type_test.dart
diff --git a/tests/language_2/map_literal10_test.dart b/tests/language_2/map/literal10_test.dart
similarity index 100%
rename from tests/language_2/map_literal10_test.dart
rename to tests/language_2/map/literal10_test.dart
diff --git a/tests/language_2/map_literal11_test.dart b/tests/language_2/map/literal11_test.dart
similarity index 100%
rename from tests/language_2/map_literal11_test.dart
rename to tests/language_2/map/literal11_test.dart
diff --git a/tests/language_2/map_literal12_test.dart b/tests/language_2/map/literal12_test.dart
similarity index 100%
rename from tests/language_2/map_literal12_test.dart
rename to tests/language_2/map/literal12_test.dart
diff --git a/tests/language_2/map_literal13_test.dart b/tests/language_2/map/literal13_test.dart
similarity index 100%
rename from tests/language_2/map_literal13_test.dart
rename to tests/language_2/map/literal13_test.dart
diff --git a/tests/language_2/map_literal14_test.dart b/tests/language_2/map/literal14_test.dart
similarity index 100%
rename from tests/language_2/map_literal14_test.dart
rename to tests/language_2/map/literal14_test.dart
diff --git a/tests/language_2/map_literal1_runtime_test.dart b/tests/language_2/map/literal1_runtime_test.dart
similarity index 100%
rename from tests/language_2/map_literal1_runtime_test.dart
rename to tests/language_2/map/literal1_runtime_test.dart
diff --git a/tests/language_2/map_literal1_test.dart b/tests/language_2/map/literal1_test.dart
similarity index 100%
rename from tests/language_2/map_literal1_test.dart
rename to tests/language_2/map/literal1_test.dart
diff --git a/tests/language_2/map_literal2_test.dart b/tests/language_2/map/literal2_test.dart
similarity index 100%
rename from tests/language_2/map_literal2_test.dart
rename to tests/language_2/map/literal2_test.dart
diff --git a/tests/language_2/map_literal3_test.dart b/tests/language_2/map/literal3_test.dart
similarity index 100%
rename from tests/language_2/map_literal3_test.dart
rename to tests/language_2/map/literal3_test.dart
diff --git a/tests/language_2/map_literal4_test.dart b/tests/language_2/map/literal4_test.dart
similarity index 100%
rename from tests/language_2/map_literal4_test.dart
rename to tests/language_2/map/literal4_test.dart
diff --git a/tests/language_2/map_literal5_test.dart b/tests/language_2/map/literal5_test.dart
similarity index 100%
rename from tests/language_2/map_literal5_test.dart
rename to tests/language_2/map/literal5_test.dart
diff --git a/tests/language_2/map_literal6_test.dart b/tests/language_2/map/literal6_test.dart
similarity index 100%
rename from tests/language_2/map_literal6_test.dart
rename to tests/language_2/map/literal6_test.dart
diff --git a/tests/language_2/map_literal7_test.dart b/tests/language_2/map/literal7_test.dart
similarity index 100%
rename from tests/language_2/map_literal7_test.dart
rename to tests/language_2/map/literal7_test.dart
diff --git a/tests/language_2/map_literal8_test.dart b/tests/language_2/map/literal8_test.dart
similarity index 100%
rename from tests/language_2/map_literal8_test.dart
rename to tests/language_2/map/literal8_test.dart
diff --git a/tests/language_2/map_literal9_test.dart b/tests/language_2/map/literal9_test.dart
similarity index 100%
rename from tests/language_2/map_literal9_test.dart
rename to tests/language_2/map/literal9_test.dart
diff --git a/tests/language_2/map_literal_syntax_test.dart b/tests/language_2/map/literal_syntax_test.dart
similarity index 100%
rename from tests/language_2/map_literal_syntax_test.dart
rename to tests/language_2/map/literal_syntax_test.dart
diff --git a/tests/language_2/map_literal_test.dart b/tests/language_2/map/literal_test.dart
similarity index 100%
rename from tests/language_2/map_literal_test.dart
rename to tests/language_2/map/literal_test.dart
diff --git a/tests/language_2/map_test.dart b/tests/language_2/map/map_test.dart
similarity index 100%
rename from tests/language_2/map_test.dart
rename to tests/language_2/map/map_test.dart
diff --git a/tests/language_2/hash_map_null_key_foreach_test.dart b/tests/language_2/map/null_key_foreach_test.dart
similarity index 100%
rename from tests/language_2/hash_map_null_key_foreach_test.dart
rename to tests/language_2/map/null_key_foreach_test.dart
diff --git a/tests/language_2/ordered_maps_test.dart b/tests/language_2/map/ordered_test.dart
similarity index 100%
rename from tests/language_2/ordered_maps_test.dart
rename to tests/language_2/map/ordered_test.dart
diff --git a/tests/language_2/cyclic_metadata_test.dart b/tests/language_2/metadata/cyclic_test.dart
similarity index 100%
rename from tests/language_2/cyclic_metadata_test.dart
rename to tests/language_2/metadata/cyclic_test.dart
diff --git a/tests/language_2/metadata_lib.dart b/tests/language_2/metadata/lib.dart
similarity index 100%
rename from tests/language_2/metadata_lib.dart
rename to tests/language_2/metadata/lib.dart
diff --git a/tests/language_2/metadata_test.dart b/tests/language_2/metadata/metadata_test.dart
similarity index 97%
rename from tests/language_2/metadata_test.dart
rename to tests/language_2/metadata/metadata_test.dart
index e358b124312..77399615e87 100644
--- a/tests/language_2/metadata_test.dart
+++ b/tests/language_2/metadata/metadata_test.dart
@@ -8,7 +8,7 @@
 library metadata_test.dart;
 
 import "package:expect/expect.dart";
-import "metadata_lib.dart" as Meta;
+import "lib.dart" as Meta;
 
 class Tag {
   final String annotation;
diff --git a/tests/language_2/metadata_scope1_test.dart b/tests/language_2/metadata/scope1_test.dart
similarity index 100%
rename from tests/language_2/metadata_scope1_test.dart
rename to tests/language_2/metadata/scope1_test.dart
diff --git a/tests/language_2/metadata_scope2_test.dart b/tests/language_2/metadata/scope2_test.dart
similarity index 100%
rename from tests/language_2/metadata_scope2_test.dart
rename to tests/language_2/metadata/scope2_test.dart
diff --git a/tests/language_2/metadata_self_test.dart b/tests/language_2/metadata/self_test.dart
similarity index 100%
rename from tests/language_2/metadata_self_test.dart
rename to tests/language_2/metadata/self_test.dart
diff --git a/tests/language_2/methods_as_constants2_test.dart b/tests/language_2/method/as_constants2_test.dart
similarity index 100%
rename from tests/language_2/methods_as_constants2_test.dart
rename to tests/language_2/method/as_constants2_test.dart
diff --git a/tests/language_2/methods_as_constants_test.dart b/tests/language_2/method/as_constants_test.dart
similarity index 100%
rename from tests/language_2/methods_as_constants_test.dart
rename to tests/language_2/method/as_constants_test.dart
diff --git a/tests/language_2/method_binding_test.dart b/tests/language_2/method/binding_test.dart
similarity index 100%
rename from tests/language_2/method_binding_test.dart
rename to tests/language_2/method/binding_test.dart
diff --git a/tests/language_2/method_invocation_test.dart b/tests/language_2/method/invocation_test.dart
similarity index 100%
rename from tests/language_2/method_invocation_test.dart
rename to tests/language_2/method/invocation_test.dart
diff --git a/tests/language_2/method_name_test.dart b/tests/language_2/method/name_test.dart
similarity index 100%
rename from tests/language_2/method_name_test.dart
rename to tests/language_2/method/name_test.dart
diff --git a/tests/language_2/method_not_found_runtime_test.dart b/tests/language_2/method/not_found_runtime_test.dart
similarity index 100%
rename from tests/language_2/method_not_found_runtime_test.dart
rename to tests/language_2/method/not_found_runtime_test.dart
diff --git a/tests/language_2/method_not_found_test.dart b/tests/language_2/method/not_found_test.dart
similarity index 100%
rename from tests/language_2/method_not_found_test.dart
rename to tests/language_2/method/not_found_test.dart
diff --git a/tests/language_2/method_override2_test.dart b/tests/language_2/method/override2_test.dart
similarity index 100%
rename from tests/language_2/method_override2_test.dart
rename to tests/language_2/method/override2_test.dart
diff --git a/tests/language_2/method_override3_runtime_test.dart b/tests/language_2/method/override3_runtime_test.dart
similarity index 100%
rename from tests/language_2/method_override3_runtime_test.dart
rename to tests/language_2/method/override3_runtime_test.dart
diff --git a/tests/language_2/method_override3_test.dart b/tests/language_2/method/override3_test.dart
similarity index 100%
rename from tests/language_2/method_override3_test.dart
rename to tests/language_2/method/override3_test.dart
diff --git a/tests/language_2/method_override7_test.dart b/tests/language_2/method/override7_test.dart
similarity index 100%
rename from tests/language_2/method_override7_test.dart
rename to tests/language_2/method/override7_test.dart
diff --git a/tests/language_2/method_override8_test.dart b/tests/language_2/method/override8_test.dart
similarity index 100%
rename from tests/language_2/method_override8_test.dart
rename to tests/language_2/method/override8_test.dart
diff --git a/tests/language_2/method_override_test.dart b/tests/language_2/method/override_test.dart
similarity index 100%
rename from tests/language_2/method_override_test.dart
rename to tests/language_2/method/override_test.dart
diff --git a/tests/language_2/mixin_abstract_getter_test.dart b/tests/language_2/mixin/abstract_getter_test.dart
similarity index 100%
rename from tests/language_2/mixin_abstract_getter_test.dart
rename to tests/language_2/mixin/abstract_getter_test.dart
diff --git a/tests/language_2/mixin_accessor_test.dart b/tests/language_2/mixin/accessor_test.dart
similarity index 100%
rename from tests/language_2/mixin_accessor_test.dart
rename to tests/language_2/mixin/accessor_test.dart
diff --git a/tests/language_2/mixin_and_extension_member_test.dart b/tests/language_2/mixin/and_extension_member_test.dart
similarity index 100%
rename from tests/language_2/mixin_and_extension_member_test.dart
rename to tests/language_2/mixin/and_extension_member_test.dart
diff --git a/tests/language_2/mixin_black_listed_test.dart b/tests/language_2/mixin/black_listed_test.dart
similarity index 100%
rename from tests/language_2/mixin_black_listed_test.dart
rename to tests/language_2/mixin/black_listed_test.dart
diff --git a/tests/language_2/mixin_bound_test.dart b/tests/language_2/mixin/bound_test.dart
similarity index 100%
rename from tests/language_2/mixin_bound_test.dart
rename to tests/language_2/mixin/bound_test.dart
diff --git a/tests/language_2/mixin_class_from_core_library_test.dart b/tests/language_2/mixin/class_from_core_library_test.dart
similarity index 100%
rename from tests/language_2/mixin_class_from_core_library_test.dart
rename to tests/language_2/mixin/class_from_core_library_test.dart
diff --git a/tests/language_2/mixin_cyclic_runtime_test.dart b/tests/language_2/mixin/cyclic_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_cyclic_runtime_test.dart
rename to tests/language_2/mixin/cyclic_runtime_test.dart
diff --git a/tests/language_2/mixin_cyclic_test.dart b/tests/language_2/mixin/cyclic_test.dart
similarity index 100%
rename from tests/language_2/mixin_cyclic_test.dart
rename to tests/language_2/mixin/cyclic_test.dart
diff --git a/tests/language_2/mixin_deduplication_test.dart b/tests/language_2/mixin/deduplication_test.dart
similarity index 100%
rename from tests/language_2/mixin_deduplication_test.dart
rename to tests/language_2/mixin/deduplication_test.dart
diff --git a/tests/language_2/mixin_extends_field_test.dart b/tests/language_2/mixin/extends_field_test.dart
similarity index 100%
rename from tests/language_2/mixin_extends_field_test.dart
rename to tests/language_2/mixin/extends_field_test.dart
diff --git a/tests/language_2/mixin_extends_is_test.dart b/tests/language_2/mixin/extends_is_test.dart
similarity index 100%
rename from tests/language_2/mixin_extends_is_test.dart
rename to tests/language_2/mixin/extends_is_test.dart
diff --git a/tests/language_2/mixin_extends_method_test.dart b/tests/language_2/mixin/extends_method_test.dart
similarity index 100%
rename from tests/language_2/mixin_extends_method_test.dart
rename to tests/language_2/mixin/extends_method_test.dart
diff --git a/tests/language_2/mixin_factory_constructor_test.dart b/tests/language_2/mixin/factory_constructor_test.dart
similarity index 100%
rename from tests/language_2/mixin_factory_constructor_test.dart
rename to tests/language_2/mixin/factory_constructor_test.dart
diff --git a/tests/language_2/mixin_field_initializer_test.dart b/tests/language_2/mixin/field_initializer_test.dart
similarity index 100%
rename from tests/language_2/mixin_field_initializer_test.dart
rename to tests/language_2/mixin/field_initializer_test.dart
diff --git a/tests/language_2/mixin_field_test.dart b/tests/language_2/mixin/field_test.dart
similarity index 100%
rename from tests/language_2/mixin_field_test.dart
rename to tests/language_2/mixin/field_test.dart
diff --git a/tests/language_2/mixin_forwarding_constructor1_test.dart b/tests/language_2/mixin/forwarding_constructor1_test.dart
similarity index 100%
rename from tests/language_2/mixin_forwarding_constructor1_test.dart
rename to tests/language_2/mixin/forwarding_constructor1_test.dart
diff --git a/tests/language_2/mixin_forwarding_constructor2_test.dart b/tests/language_2/mixin/forwarding_constructor2_test.dart
similarity index 100%
rename from tests/language_2/mixin_forwarding_constructor2_test.dart
rename to tests/language_2/mixin/forwarding_constructor2_test.dart
diff --git a/tests/language_2/mixin_forwarding_constructor3_test.dart b/tests/language_2/mixin/forwarding_constructor3_test.dart
similarity index 100%
rename from tests/language_2/mixin_forwarding_constructor3_test.dart
rename to tests/language_2/mixin/forwarding_constructor3_test.dart
diff --git a/tests/language_2/mixin_forwarding_constructor4_test.dart b/tests/language_2/mixin/forwarding_constructor4_test.dart
similarity index 100%
rename from tests/language_2/mixin_forwarding_constructor4_test.dart
rename to tests/language_2/mixin/forwarding_constructor4_test.dart
diff --git a/tests/language_2/mixin_generic_test.dart b/tests/language_2/mixin/generic_test.dart
similarity index 100%
rename from tests/language_2/mixin_generic_test.dart
rename to tests/language_2/mixin/generic_test.dart
diff --git a/tests/language_2/mixin_getter_regression_test.dart b/tests/language_2/mixin/getter_regression_test.dart
similarity index 100%
rename from tests/language_2/mixin_getter_regression_test.dart
rename to tests/language_2/mixin/getter_regression_test.dart
diff --git a/tests/language_2/mixin_illegal_constructor_runtime_test.dart b/tests/language_2/mixin/illegal_constructor_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_constructor_runtime_test.dart
rename to tests/language_2/mixin/illegal_constructor_runtime_test.dart
diff --git a/tests/language_2/mixin_illegal_constructor_test.dart b/tests/language_2/mixin/illegal_constructor_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_constructor_test.dart
rename to tests/language_2/mixin/illegal_constructor_test.dart
diff --git a/tests/language_2/mixin_illegal_cycles_runtime_test.dart b/tests/language_2/mixin/illegal_cycles_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_cycles_runtime_test.dart
rename to tests/language_2/mixin/illegal_cycles_runtime_test.dart
diff --git a/tests/language_2/mixin_illegal_cycles_test.dart b/tests/language_2/mixin/illegal_cycles_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_cycles_test.dart
rename to tests/language_2/mixin/illegal_cycles_test.dart
diff --git a/tests/language_2/mixin_illegal_object_runtime_test.dart b/tests/language_2/mixin/illegal_object_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_object_runtime_test.dart
rename to tests/language_2/mixin/illegal_object_runtime_test.dart
diff --git a/tests/language_2/mixin_illegal_object_test.dart b/tests/language_2/mixin/illegal_object_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_object_test.dart
rename to tests/language_2/mixin/illegal_object_test.dart
diff --git a/tests/language_2/mixin_illegal_static_access_runtime_test.dart b/tests/language_2/mixin/illegal_static_access_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_static_access_runtime_test.dart
rename to tests/language_2/mixin/illegal_static_access_runtime_test.dart
diff --git a/tests/language_2/mixin_illegal_static_access_test.dart b/tests/language_2/mixin/illegal_static_access_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_static_access_test.dart
rename to tests/language_2/mixin/illegal_static_access_test.dart
diff --git a/tests/language_2/mixin_illegal_super_use_runtime_test.dart b/tests/language_2/mixin/illegal_super_use_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_super_use_runtime_test.dart
rename to tests/language_2/mixin/illegal_super_use_runtime_test.dart
diff --git a/tests/language_2/mixin_illegal_super_use_test.dart b/tests/language_2/mixin/illegal_super_use_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_super_use_test.dart
rename to tests/language_2/mixin/illegal_super_use_test.dart
diff --git a/tests/language_2/mixin_illegal_superclass_runtime_test.dart b/tests/language_2/mixin/illegal_superclass_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_superclass_runtime_test.dart
rename to tests/language_2/mixin/illegal_superclass_runtime_test.dart
diff --git a/tests/language_2/mixin_illegal_superclass_test.dart b/tests/language_2/mixin/illegal_superclass_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_superclass_test.dart
rename to tests/language_2/mixin/illegal_superclass_test.dart
diff --git a/tests/language_2/mixin_illegal_syntax_test.dart b/tests/language_2/mixin/illegal_syntax_test.dart
similarity index 100%
rename from tests/language_2/mixin_illegal_syntax_test.dart
rename to tests/language_2/mixin/illegal_syntax_test.dart
diff --git a/tests/language_2/mixin_implements2_test.dart b/tests/language_2/mixin/implements2_test.dart
similarity index 100%
rename from tests/language_2/mixin_implements2_test.dart
rename to tests/language_2/mixin/implements2_test.dart
diff --git a/tests/language_2/mixin_implements_test.dart b/tests/language_2/mixin/implements_test.dart
similarity index 100%
rename from tests/language_2/mixin_implements_test.dart
rename to tests/language_2/mixin/implements_test.dart
diff --git a/tests/language_2/mixin_implicit_covariance_test.dart b/tests/language_2/mixin/implicit_covariance_test.dart
similarity index 100%
rename from tests/language_2/mixin_implicit_covariance_test.dart
rename to tests/language_2/mixin/implicit_covariance_test.dart
diff --git a/tests/language_2/inference_mixin_field_test.dart b/tests/language_2/mixin/inference_mixin_field_test.dart
similarity index 100%
rename from tests/language_2/inference_mixin_field_test.dart
rename to tests/language_2/mixin/inference_mixin_field_test.dart
diff --git a/tests/language_2/mixin_interface_check_runtime_test.dart b/tests/language_2/mixin/interface_check_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_interface_check_runtime_test.dart
rename to tests/language_2/mixin/interface_check_runtime_test.dart
diff --git a/tests/language_2/mixin_interface_check_test.dart b/tests/language_2/mixin/interface_check_test.dart
similarity index 100%
rename from tests/language_2/mixin_interface_check_test.dart
rename to tests/language_2/mixin/interface_check_test.dart
diff --git a/tests/language_2/mixin_invalid_bound2_test.dart b/tests/language_2/mixin/invalid_bound2_test.dart
similarity index 100%
rename from tests/language_2/mixin_invalid_bound2_test.dart
rename to tests/language_2/mixin/invalid_bound2_test.dart
diff --git a/tests/language_2/mixin_invalid_bound_test.dart b/tests/language_2/mixin/invalid_bound_test.dart
similarity index 100%
rename from tests/language_2/mixin_invalid_bound_test.dart
rename to tests/language_2/mixin/invalid_bound_test.dart
diff --git a/tests/language_2/mixin_invalid_inheritance1_test.dart b/tests/language_2/mixin/invalid_inheritance1_test.dart
similarity index 100%
rename from tests/language_2/mixin_invalid_inheritance1_test.dart
rename to tests/language_2/mixin/invalid_inheritance1_test.dart
diff --git a/tests/language_2/mixin_invalid_inheritance2_test.dart b/tests/language_2/mixin/invalid_inheritance2_test.dart
similarity index 100%
rename from tests/language_2/mixin_invalid_inheritance2_test.dart
rename to tests/language_2/mixin/invalid_inheritance2_test.dart
diff --git a/tests/language_2/invalid_override_in_mixin_runtime_test.dart b/tests/language_2/mixin/invalid_override_in_mixin_runtime_test.dart
similarity index 100%
rename from tests/language_2/invalid_override_in_mixin_runtime_test.dart
rename to tests/language_2/mixin/invalid_override_in_mixin_runtime_test.dart
diff --git a/tests/language_2/invalid_override_in_mixin_test.dart b/tests/language_2/mixin/invalid_override_in_mixin_test.dart
similarity index 100%
rename from tests/language_2/invalid_override_in_mixin_test.dart
rename to tests/language_2/mixin/invalid_override_in_mixin_test.dart
diff --git a/tests/language_2/mixin_is_test.dart b/tests/language_2/mixin/is_test.dart
similarity index 100%
rename from tests/language_2/mixin_is_test.dart
rename to tests/language_2/mixin/is_test.dart
diff --git a/tests/language_2/mixin_issue10216_2_test.dart b/tests/language_2/mixin/issue10216_2_test.dart
similarity index 100%
rename from tests/language_2/mixin_issue10216_2_test.dart
rename to tests/language_2/mixin/issue10216_2_test.dart
diff --git a/tests/language_2/mixin_issue10216_test.dart b/tests/language_2/mixin/issue10216_test.dart
similarity index 100%
rename from tests/language_2/mixin_issue10216_test.dart
rename to tests/language_2/mixin/issue10216_test.dart
diff --git a/tests/language_2/mixin_lib_extends_field_lib.dart b/tests/language_2/mixin/lib_extends_field_lib.dart
similarity index 100%
rename from tests/language_2/mixin_lib_extends_field_lib.dart
rename to tests/language_2/mixin/lib_extends_field_lib.dart
diff --git a/tests/language_2/mixin_lib_extends_field_test.dart b/tests/language_2/mixin/lib_extends_field_test.dart
similarity index 98%
rename from tests/language_2/mixin_lib_extends_field_test.dart
rename to tests/language_2/mixin/lib_extends_field_test.dart
index aeeabbe8f12..e509a940cb9 100644
--- a/tests/language_2/mixin_lib_extends_field_test.dart
+++ b/tests/language_2/mixin/lib_extends_field_test.dart
@@ -5,7 +5,7 @@
 library mixin_lib_extends_field_test;
 
 import 'package:expect/expect.dart';
-import "mixin_lib_extends_field_lib.dart" as L;
+import "lib_extends_field_lib.dart" as L;
 
 class S {
   var foo = "S-foo";
diff --git a/tests/language_2/mixin_lib_extends_method_lib.dart b/tests/language_2/mixin/lib_extends_method_lib.dart
similarity index 100%
rename from tests/language_2/mixin_lib_extends_method_lib.dart
rename to tests/language_2/mixin/lib_extends_method_lib.dart
diff --git a/tests/language_2/mixin_lib_extends_method_test.dart b/tests/language_2/mixin/lib_extends_method_test.dart
similarity index 96%
rename from tests/language_2/mixin_lib_extends_method_test.dart
rename to tests/language_2/mixin/lib_extends_method_test.dart
index ffbaf6381cb..59ae2caec27 100644
--- a/tests/language_2/mixin_lib_extends_method_test.dart
+++ b/tests/language_2/mixin/lib_extends_method_test.dart
@@ -5,7 +5,7 @@
 library mixin_lib_extends_method_test;
 
 import "package:expect/expect.dart";
-import "mixin_lib_extends_method_lib.dart" as L;
+import "lib_extends_method_lib.dart" as L;
 
 class S {
   foo() => "S-foo";
diff --git a/tests/language_2/mixin_method_override_runtime_test.dart b/tests/language_2/mixin/method_override_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_method_override_runtime_test.dart
rename to tests/language_2/mixin/method_override_runtime_test.dart
diff --git a/tests/language_2/mixin_method_override_test.dart b/tests/language_2/mixin/method_override_test.dart
similarity index 100%
rename from tests/language_2/mixin_method_override_test.dart
rename to tests/language_2/mixin/method_override_test.dart
diff --git a/tests/language_2/mixin_method_test.dart b/tests/language_2/mixin/method_test.dart
similarity index 100%
rename from tests/language_2/mixin_method_test.dart
rename to tests/language_2/mixin/method_test.dart
diff --git a/tests/language_2/mixin_mixin2_test.dart b/tests/language_2/mixin/mixin2_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin2_test.dart
rename to tests/language_2/mixin/mixin2_test.dart
diff --git a/tests/language_2/mixin_mixin3_test.dart b/tests/language_2/mixin/mixin3_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin3_test.dart
rename to tests/language_2/mixin/mixin3_test.dart
diff --git a/tests/language_2/mixin_mixin4_test.dart b/tests/language_2/mixin/mixin4_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin4_test.dart
rename to tests/language_2/mixin/mixin4_test.dart
diff --git a/tests/language_2/mixin_mixin5_test.dart b/tests/language_2/mixin/mixin5_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin5_test.dart
rename to tests/language_2/mixin/mixin5_test.dart
diff --git a/tests/language_2/mixin_mixin6_test.dart b/tests/language_2/mixin/mixin6_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin6_test.dart
rename to tests/language_2/mixin/mixin6_test.dart
diff --git a/tests/language_2/mixin_mixin7_test.dart b/tests/language_2/mixin/mixin7_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin7_test.dart
rename to tests/language_2/mixin/mixin7_test.dart
diff --git a/tests/language_2/mixin_mixin_bound2_test.dart b/tests/language_2/mixin/mixin_bound2_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin_bound2_test.dart
rename to tests/language_2/mixin/mixin_bound2_test.dart
diff --git a/tests/language_2/mixin_mixin_bound_test.dart b/tests/language_2/mixin/mixin_bound_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin_bound_test.dart
rename to tests/language_2/mixin/mixin_bound_test.dart
diff --git a/tests/language_2/mixin_mixin_test.dart b/tests/language_2/mixin/mixin_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin_test.dart
rename to tests/language_2/mixin/mixin_test.dart
diff --git a/tests/language_2/mixin_mixin_type_arguments_test.dart b/tests/language_2/mixin/mixin_type_arguments_test.dart
similarity index 100%
rename from tests/language_2/mixin_mixin_type_arguments_test.dart
rename to tests/language_2/mixin/mixin_type_arguments_test.dart
diff --git a/tests/language_2/mixin_named_constructor_test.dart b/tests/language_2/mixin/named_constructor_test.dart
similarity index 100%
rename from tests/language_2/mixin_named_constructor_test.dart
rename to tests/language_2/mixin/named_constructor_test.dart
diff --git a/tests/language_2/mixin_naming_test.dart b/tests/language_2/mixin/naming_test.dart
similarity index 100%
rename from tests/language_2/mixin_naming_test.dart
rename to tests/language_2/mixin/naming_test.dart
diff --git a/tests/language_2/mixin_only_for_rti_test.dart b/tests/language_2/mixin/only_for_rti_test.dart
similarity index 100%
rename from tests/language_2/mixin_only_for_rti_test.dart
rename to tests/language_2/mixin/only_for_rti_test.dart
diff --git a/tests/language_2/mixin_override_regression_test.dart b/tests/language_2/mixin/override_regression_test.dart
similarity index 100%
rename from tests/language_2/mixin_override_regression_test.dart
rename to tests/language_2/mixin/override_regression_test.dart
diff --git a/tests/language_2/mixin_prefix_lib.dart b/tests/language_2/mixin/prefix_lib.dart
similarity index 100%
rename from tests/language_2/mixin_prefix_lib.dart
rename to tests/language_2/mixin/prefix_lib.dart
diff --git a/tests/language_2/mixin_prefix_test.dart b/tests/language_2/mixin/prefix_test.dart
similarity index 93%
rename from tests/language_2/mixin_prefix_test.dart
rename to tests/language_2/mixin/prefix_test.dart
index eea64ce0154..59eb4427904 100644
--- a/tests/language_2/mixin_prefix_test.dart
+++ b/tests/language_2/mixin/prefix_test.dart
@@ -5,7 +5,7 @@
 // Regression test for issue 11891.
 
 import "package:expect/expect.dart";
-import "mixin_prefix_lib.dart";
+import "prefix_lib.dart";
 
 class A extends Object with MixinClass {
   String baz() => bar();
diff --git a/tests/language_2/mixin_proto_test.dart b/tests/language_2/mixin/proto_test.dart
similarity index 100%
rename from tests/language_2/mixin_proto_test.dart
rename to tests/language_2/mixin/proto_test.dart
diff --git a/tests/language_2/recursive_mixin_test.dart b/tests/language_2/mixin/recursive_mixin_test.dart
similarity index 100%
rename from tests/language_2/recursive_mixin_test.dart
rename to tests/language_2/mixin/recursive_mixin_test.dart
diff --git a/tests/language_2/mixin_regress_11398_test.dart b/tests/language_2/mixin/regress_11398_test.dart
similarity index 100%
rename from tests/language_2/mixin_regress_11398_test.dart
rename to tests/language_2/mixin/regress_11398_test.dart
diff --git a/tests/language_2/mixin_regress_13688_test.dart b/tests/language_2/mixin/regress_13688_test.dart
similarity index 100%
rename from tests/language_2/mixin_regress_13688_test.dart
rename to tests/language_2/mixin/regress_13688_test.dart
diff --git a/tests/language_2/typevariable_substitution2_test.dart b/tests/language_2/mixin/substitution_test.dart
similarity index 73%
rename from tests/language_2/typevariable_substitution2_test.dart
rename to tests/language_2/mixin/substitution_test.dart
index 344db7100c4..d6121db7129 100644
--- a/tests/language_2/typevariable_substitution2_test.dart
+++ b/tests/language_2/mixin/substitution_test.dart
@@ -4,7 +4,7 @@
 
 // Test that mixins don't interfere with type variable substitution.
 
-import 'dynamic_type_helper.dart';
+import '../dynamic_type_helper.dart';
 
 class B<T> {
   B(T x);
@@ -20,7 +20,7 @@ class C<T> = B<T> with M;
 
 main() {
   new A(null);
-  new C<String>(''); //# 01: ok
-  dynamic value = 0; //# 02: ok
-  checkDynamicTypeError(() => new C<String>(value)); //# 02: continued
+  new C<String>('');
+  dynamic value = 0;
+  checkDynamicTypeError(() => new C<String>(value));
 }
diff --git a/tests/language_2/mixin_super_2_test.dart b/tests/language_2/mixin/super_2_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_2_test.dart
rename to tests/language_2/mixin/super_2_test.dart
diff --git a/tests/language_2/mixin_super_bound_runtime_test.dart b/tests/language_2/mixin/super_bound_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_bound_runtime_test.dart
rename to tests/language_2/mixin/super_bound_runtime_test.dart
diff --git a/tests/language_2/mixin_super_bound_test.dart b/tests/language_2/mixin/super_bound_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_bound_test.dart
rename to tests/language_2/mixin/super_bound_test.dart
diff --git a/tests/language_2/mixin_super_constructor2_test.dart b/tests/language_2/mixin/super_constructor2_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_constructor2_test.dart
rename to tests/language_2/mixin/super_constructor2_test.dart
diff --git a/tests/language_2/mixin_super_constructor_default_test.dart b/tests/language_2/mixin/super_constructor_default_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_constructor_default_test.dart
rename to tests/language_2/mixin/super_constructor_default_test.dart
diff --git a/tests/language_2/mixin_super_constructor_multiple_test.dart b/tests/language_2/mixin/super_constructor_multiple_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_constructor_multiple_test.dart
rename to tests/language_2/mixin/super_constructor_multiple_test.dart
diff --git a/tests/language_2/mixin_super_constructor_named_test.dart b/tests/language_2/mixin/super_constructor_named_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_constructor_named_test.dart
rename to tests/language_2/mixin/super_constructor_named_test.dart
diff --git a/tests/language_2/mixin_super_constructor_positionals_test.dart b/tests/language_2/mixin/super_constructor_positionals_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_constructor_positionals_test.dart
rename to tests/language_2/mixin/super_constructor_positionals_test.dart
diff --git a/tests/language_2/mixin_super_constructor_test.dart b/tests/language_2/mixin/super_constructor_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_constructor_test.dart
rename to tests/language_2/mixin/super_constructor_test.dart
diff --git a/tests/language_2/mixin_super_test.dart b/tests/language_2/mixin/super_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_test.dart
rename to tests/language_2/mixin/super_test.dart
diff --git a/tests/language_2/mixin_super_use_test.dart b/tests/language_2/mixin/super_use_test.dart
similarity index 100%
rename from tests/language_2/mixin_super_use_test.dart
rename to tests/language_2/mixin/super_use_test.dart
diff --git a/tests/language_2/mixin_superclass_runtime_test.dart b/tests/language_2/mixin/superclass_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_superclass_runtime_test.dart
rename to tests/language_2/mixin/superclass_runtime_test.dart
diff --git a/tests/language_2/mixin_superclass_test.dart b/tests/language_2/mixin/superclass_test.dart
similarity index 100%
rename from tests/language_2/mixin_superclass_test.dart
rename to tests/language_2/mixin/superclass_test.dart
diff --git a/tests/language_2/mixin_supertype_subclass2_test.dart b/tests/language_2/mixin/supertype_subclass2_test.dart
similarity index 100%
rename from tests/language_2/mixin_supertype_subclass2_test.dart
rename to tests/language_2/mixin/supertype_subclass2_test.dart
diff --git a/tests/language_2/mixin_supertype_subclass_test.dart b/tests/language_2/mixin/supertype_subclass_test.dart
similarity index 100%
rename from tests/language_2/mixin_supertype_subclass_test.dart
rename to tests/language_2/mixin/supertype_subclass_test.dart
diff --git a/tests/language_2/mixin_this_use_test.dart b/tests/language_2/mixin/this_use_test.dart
similarity index 100%
rename from tests/language_2/mixin_this_use_test.dart
rename to tests/language_2/mixin/this_use_test.dart
diff --git a/tests/language_2/mixin_type_parameter1_test.dart b/tests/language_2/mixin/type_parameter1_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter1_test.dart
rename to tests/language_2/mixin/type_parameter1_test.dart
diff --git a/tests/language_2/mixin_type_parameter2_test.dart b/tests/language_2/mixin/type_parameter2_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter2_test.dart
rename to tests/language_2/mixin/type_parameter2_test.dart
diff --git a/tests/language_2/mixin_type_parameter3_test.dart b/tests/language_2/mixin/type_parameter3_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter3_test.dart
rename to tests/language_2/mixin/type_parameter3_test.dart
diff --git a/tests/language_2/mixin_type_parameter4_test.dart b/tests/language_2/mixin/type_parameter4_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter4_test.dart
rename to tests/language_2/mixin/type_parameter4_test.dart
diff --git a/tests/language_2/mixin_type_parameter5_test.dart b/tests/language_2/mixin/type_parameter5_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter5_test.dart
rename to tests/language_2/mixin/type_parameter5_test.dart
diff --git a/tests/language_2/mixin_type_parameter6_test.dart b/tests/language_2/mixin/type_parameter6_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter6_test.dart
rename to tests/language_2/mixin/type_parameter6_test.dart
diff --git a/tests/language_2/mixin_type_parameter_inference_error_test.dart b/tests/language_2/mixin/type_parameter_inference_error_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter_inference_error_test.dart
rename to tests/language_2/mixin/type_parameter_inference_error_test.dart
diff --git a/tests/language_2/mixin_type_parameter_inference_previous_mixin_test.dart b/tests/language_2/mixin/type_parameter_inference_previous_mixin_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter_inference_previous_mixin_test.dart
rename to tests/language_2/mixin/type_parameter_inference_previous_mixin_test.dart
diff --git a/tests/language_2/mixin_type_parameter_inference_test.dart b/tests/language_2/mixin/type_parameter_inference_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameter_inference_test.dart
rename to tests/language_2/mixin/type_parameter_inference_test.dart
diff --git a/tests/language_2/mixin_type_parameters_errors_runtime_test.dart b/tests/language_2/mixin/type_parameters_errors_runtime_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameters_errors_runtime_test.dart
rename to tests/language_2/mixin/type_parameters_errors_runtime_test.dart
diff --git a/tests/language_2/mixin_type_parameters_errors_test.dart b/tests/language_2/mixin/type_parameters_errors_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameters_errors_test.dart
rename to tests/language_2/mixin/type_parameters_errors_test.dart
diff --git a/tests/language_2/mixin_type_parameters_mixin_extends_test.dart b/tests/language_2/mixin/type_parameters_mixin_extends_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameters_mixin_extends_test.dart
rename to tests/language_2/mixin/type_parameters_mixin_extends_test.dart
diff --git a/tests/language_2/mixin_type_parameters_mixin_test.dart b/tests/language_2/mixin/type_parameters_mixin_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameters_mixin_test.dart
rename to tests/language_2/mixin/type_parameters_mixin_test.dart
diff --git a/tests/language_2/mixin_type_parameters_simple_test.dart b/tests/language_2/mixin/type_parameters_simple_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameters_simple_test.dart
rename to tests/language_2/mixin/type_parameters_simple_test.dart
diff --git a/tests/language_2/mixin_type_parameters_super_extends_test.dart b/tests/language_2/mixin/type_parameters_super_extends_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameters_super_extends_test.dart
rename to tests/language_2/mixin/type_parameters_super_extends_test.dart
diff --git a/tests/language_2/mixin_type_parameters_super_test.dart b/tests/language_2/mixin/type_parameters_super_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_parameters_super_test.dart
rename to tests/language_2/mixin/type_parameters_super_test.dart
diff --git a/tests/language_2/mixin_type_variable_test.dart b/tests/language_2/mixin/type_variable_test.dart
similarity index 100%
rename from tests/language_2/mixin_type_variable_test.dart
rename to tests/language_2/mixin/type_variable_test.dart
diff --git a/tests/language_2/mixin_typedef_constructor_test.dart b/tests/language_2/mixin/typedef_constructor_test.dart
similarity index 100%
rename from tests/language_2/mixin_typedef_constructor_test.dart
rename to tests/language_2/mixin/typedef_constructor_test.dart
diff --git a/tests/language_2/mixin_with_named_import_test.dart b/tests/language_2/mixin/with_named_import_test.dart
similarity index 100%
rename from tests/language_2/mixin_with_named_import_test.dart
rename to tests/language_2/mixin/with_named_import_test.dart
diff --git a/tests/language_2/mixin_with_two_implicit_constructors_test.dart b/tests/language_2/mixin/with_two_implicit_constructors_test.dart
similarity index 100%
rename from tests/language_2/mixin_with_two_implicit_constructors_test.dart
rename to tests/language_2/mixin/with_two_implicit_constructors_test.dart
diff --git a/tests/language_2/create_unresolved_type_runtime_test.dart b/tests/language_2/new/create_unresolved_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/create_unresolved_type_runtime_test.dart
rename to tests/language_2/new/create_unresolved_type_runtime_test.dart
diff --git a/tests/language_2/create_unresolved_type_test.dart b/tests/language_2/new/create_unresolved_type_test.dart
similarity index 100%
rename from tests/language_2/create_unresolved_type_test.dart
rename to tests/language_2/new/create_unresolved_type_test.dart
diff --git a/tests/language_2/new_expression1_test.dart b/tests/language_2/new/expression1_test.dart
similarity index 100%
rename from tests/language_2/new_expression1_test.dart
rename to tests/language_2/new/expression1_test.dart
diff --git a/tests/language_2/new_expression2_test.dart b/tests/language_2/new/expression2_test.dart
similarity index 100%
rename from tests/language_2/new_expression2_test.dart
rename to tests/language_2/new/expression2_test.dart
diff --git a/tests/language_2/new_expression3_test.dart b/tests/language_2/new/expression3_test.dart
similarity index 100%
rename from tests/language_2/new_expression3_test.dart
rename to tests/language_2/new/expression3_test.dart
diff --git a/tests/language_2/new_expression_type_args_runtime_test.dart b/tests/language_2/new/expression_type_args_runtime_test.dart
similarity index 100%
rename from tests/language_2/new_expression_type_args_runtime_test.dart
rename to tests/language_2/new/expression_type_args_runtime_test.dart
diff --git a/tests/language_2/new_expression_type_args_test.dart b/tests/language_2/new/expression_type_args_test.dart
similarity index 100%
rename from tests/language_2/new_expression_type_args_test.dart
rename to tests/language_2/new/expression_type_args_test.dart
diff --git a/tests/language_2/new_prefix_runtime_test.dart b/tests/language_2/new/prefix_runtime_test.dart
similarity index 100%
rename from tests/language_2/new_prefix_runtime_test.dart
rename to tests/language_2/new/prefix_runtime_test.dart
diff --git a/tests/language_2/new_prefix_test.dart b/tests/language_2/new/prefix_test.dart
similarity index 100%
rename from tests/language_2/new_prefix_test.dart
rename to tests/language_2/new/prefix_test.dart
diff --git a/tests/language_2/new_statement_test.dart b/tests/language_2/new/statement_test.dart
similarity index 100%
rename from tests/language_2/new_statement_test.dart
rename to tests/language_2/new/statement_test.dart
diff --git a/tests/language_2/no_such_method_dispatcher_test.dart b/tests/language_2/no_such_method/dispatcher_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_dispatcher_test.dart
rename to tests/language_2/no_such_method/dispatcher_test.dart
diff --git a/tests/language_2/no_such_method_empty_selector_test.dart b/tests/language_2/no_such_method/empty_selector_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_empty_selector_test.dart
rename to tests/language_2/no_such_method/empty_selector_test.dart
diff --git a/tests/language_2/many_overridden_no_such_method_test.dart b/tests/language_2/no_such_method/many_overridden_test.dart
similarity index 93%
rename from tests/language_2/many_overridden_no_such_method_test.dart
rename to tests/language_2/no_such_method/many_overridden_test.dart
index d1230e6ea0a..77750d3c3a3 100644
--- a/tests/language_2/many_overridden_no_such_method_test.dart
+++ b/tests/language_2/no_such_method/many_overridden_test.dart
@@ -7,7 +7,7 @@ library OverriddenNoSuchMethodTest.dart;
 
 import "package:expect/expect.dart";
 
-part "overridden_no_such_method.dart";
+part "overridden.dart";
 
 class ManyOverriddenNoSuchMethodTest {
   static testMain() {
diff --git a/tests/language_2/megamorphic_no_such_method_test.dart b/tests/language_2/no_such_method/megamorphic_test.dart
similarity index 100%
rename from tests/language_2/megamorphic_no_such_method_test.dart
rename to tests/language_2/no_such_method/megamorphic_test.dart
diff --git a/tests/language_2/no_such_method_mock_test.dart b/tests/language_2/no_such_method/mock_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_mock_test.dart
rename to tests/language_2/no_such_method/mock_test.dart
diff --git a/tests/language_2/no_such_method_native_test.dart b/tests/language_2/no_such_method/native_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_native_test.dart
rename to tests/language_2/no_such_method/native_test.dart
diff --git a/tests/language_2/no_such_method2_test.dart b/tests/language_2/no_such_method/no_such_method2_test.dart
similarity index 100%
rename from tests/language_2/no_such_method2_test.dart
rename to tests/language_2/no_such_method/no_such_method2_test.dart
diff --git a/tests/language_2/no_such_method3_test.dart b/tests/language_2/no_such_method/no_such_method3_test.dart
similarity index 100%
rename from tests/language_2/no_such_method3_test.dart
rename to tests/language_2/no_such_method/no_such_method3_test.dart
diff --git a/tests/language_2/no_such_method4_test.dart b/tests/language_2/no_such_method/no_such_method4_test.dart
similarity index 100%
rename from tests/language_2/no_such_method4_test.dart
rename to tests/language_2/no_such_method/no_such_method4_test.dart
diff --git a/tests/language_2/no_such_method_private_setter_lib.dart b/tests/language_2/no_such_method/no_such_method_private_setter_lib.dart
similarity index 100%
rename from tests/language_2/no_such_method_private_setter_lib.dart
rename to tests/language_2/no_such_method/no_such_method_private_setter_lib.dart
diff --git a/tests/language_2/no_such_method_test.dart b/tests/language_2/no_such_method/no_such_method_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_test.dart
rename to tests/language_2/no_such_method/no_such_method_test.dart
diff --git a/tests/language_2/nsm4_test.dart b/tests/language_2/no_such_method/nsm4_test.dart
similarity index 100%
rename from tests/language_2/nsm4_test.dart
rename to tests/language_2/no_such_method/nsm4_test.dart
diff --git a/tests/language_2/nsm5_test.dart b/tests/language_2/no_such_method/nsm5_test.dart
similarity index 100%
rename from tests/language_2/nsm5_test.dart
rename to tests/language_2/no_such_method/nsm5_test.dart
diff --git a/tests/language_2/overridden_no_such_method.dart b/tests/language_2/no_such_method/overridden.dart
similarity index 100%
rename from tests/language_2/overridden_no_such_method.dart
rename to tests/language_2/no_such_method/overridden.dart
diff --git a/tests/language_2/overridden_no_such_method_test.dart b/tests/language_2/no_such_method/overridden_no_such_method_test.dart
similarity index 91%
rename from tests/language_2/overridden_no_such_method_test.dart
rename to tests/language_2/no_such_method/overridden_no_such_method_test.dart
index 3aa37be5592..598ffb17732 100644
--- a/tests/language_2/overridden_no_such_method_test.dart
+++ b/tests/language_2/no_such_method/overridden_no_such_method_test.dart
@@ -6,7 +6,7 @@
 library OverriddenNoSuchMethodTest.dart;
 
 import "package:expect/expect.dart";
-part "overridden_no_such_method.dart";
+part "overridden.dart";
 
 main() {
   OverriddenNoSuchMethod.testMain();
diff --git a/tests/language_2/no_such_method_private_setter_test.dart b/tests/language_2/no_such_method/private_setter_test.dart
similarity index 85%
rename from tests/language_2/no_such_method_private_setter_test.dart
rename to tests/language_2/no_such_method/private_setter_test.dart
index 8e9a4c32e15..0f110bb9d2a 100644
--- a/tests/language_2/no_such_method_private_setter_test.dart
+++ b/tests/language_2/no_such_method/private_setter_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import './no_such_method_private_setter_lib.dart';
+import 'no_such_method_private_setter_lib.dart';
 
 class Foo implements Bar {}
 
diff --git a/tests/language_2/no_such_method_simple_type_arguments_test.dart b/tests/language_2/no_such_method/simple_type_arguments_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_simple_type_arguments_test.dart
rename to tests/language_2/no_such_method/simple_type_arguments_test.dart
diff --git a/tests/language_2/no_such_method_subtype_test.dart b/tests/language_2/no_such_method/subtype_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_subtype_test.dart
rename to tests/language_2/no_such_method/subtype_test.dart
diff --git a/tests/language_2/no_such_method_tearoff_fta_test.dart b/tests/language_2/no_such_method/tearoff_fta_test.dart
similarity index 100%
rename from tests/language_2/no_such_method_tearoff_fta_test.dart
rename to tests/language_2/no_such_method/tearoff_fta_test.dart
diff --git a/tests/language_2/null_access_error_test.dart b/tests/language_2/null/access_error_test.dart
similarity index 100%
rename from tests/language_2/null_access_error_test.dart
rename to tests/language_2/null/access_error_test.dart
diff --git a/tests/language_2/checked_null_test.dart b/tests/language_2/null/checked_null_test.dart
similarity index 100%
rename from tests/language_2/checked_null_test.dart
rename to tests/language_2/null/checked_null_test.dart
diff --git a/tests/language_2/checked_null_runtime_test.dart b/tests/language_2/null/checked_runtime_test.dart
similarity index 100%
rename from tests/language_2/checked_null_runtime_test.dart
rename to tests/language_2/null/checked_runtime_test.dart
diff --git a/tests/language_2/null_inline_test.dart b/tests/language_2/null/inline_test.dart
similarity index 100%
rename from tests/language_2/null_inline_test.dart
rename to tests/language_2/null/inline_test.dart
diff --git a/tests/language_2/null_is2_test.dart b/tests/language_2/null/is2_test.dart
similarity index 100%
rename from tests/language_2/null_is2_test.dart
rename to tests/language_2/null/is2_test.dart
diff --git a/tests/language_2/null_is_test.dart b/tests/language_2/null/is_test.dart
similarity index 100%
rename from tests/language_2/null_is_test.dart
rename to tests/language_2/null/is_test.dart
diff --git a/tests/language_2/null_method_test.dart b/tests/language_2/null/method_test.dart
similarity index 100%
rename from tests/language_2/null_method_test.dart
rename to tests/language_2/null/method_test.dart
diff --git a/tests/language_2/null_no_such_method_test.dart b/tests/language_2/null/no_such_method_test.dart
similarity index 100%
rename from tests/language_2/null_no_such_method_test.dart
rename to tests/language_2/null/no_such_method_test.dart
diff --git a/tests/language_2/null2_test.dart b/tests/language_2/null/null2_test.dart
similarity index 100%
rename from tests/language_2/null2_test.dart
rename to tests/language_2/null/null2_test.dart
diff --git a/tests/language_2/null_test.dart b/tests/language_2/null/null_test.dart
similarity index 100%
rename from tests/language_2/null_test.dart
rename to tests/language_2/null/null_test.dart
diff --git a/tests/language_2/null_to_string2_test.dart b/tests/language_2/null/to_string2_test.dart
similarity index 100%
rename from tests/language_2/null_to_string2_test.dart
rename to tests/language_2/null/to_string2_test.dart
diff --git a/tests/language_2/null_to_string_test.dart b/tests/language_2/null/to_string_test.dart
similarity index 100%
rename from tests/language_2/null_to_string_test.dart
rename to tests/language_2/null/to_string_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_1_test.dart b/tests/language_2/null_aware/access_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_1_test.dart
rename to tests/language_2/null_aware/access_runtime_1_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_2_test.dart b/tests/language_2/null_aware/access_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_2_test.dart
rename to tests/language_2/null_aware/access_runtime_2_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_3_test.dart b/tests/language_2/null_aware/access_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_3_test.dart
rename to tests/language_2/null_aware/access_runtime_3_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_4_test.dart b/tests/language_2/null_aware/access_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_4_test.dart
rename to tests/language_2/null_aware/access_runtime_4_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_5_test.dart b/tests/language_2/null_aware/access_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_5_test.dart
rename to tests/language_2/null_aware/access_runtime_5_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_6_test.dart b/tests/language_2/null_aware/access_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_6_test.dart
rename to tests/language_2/null_aware/access_runtime_6_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_7_test.dart b/tests/language_2/null_aware/access_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_7_test.dart
rename to tests/language_2/null_aware/access_runtime_7_test.dart
diff --git a/tests/language_2/conditional_property_access_runtime_test.dart b/tests/language_2/null_aware/access_runtime_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_runtime_test.dart
rename to tests/language_2/null_aware/access_runtime_test.dart
diff --git a/tests/language_2/conditional_property_access_test.dart b/tests/language_2/null_aware/access_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_access_test.dart
rename to tests/language_2/null_aware/access_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_10_test.dart b/tests/language_2/null_aware/assignment_runtime_10_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_10_test.dart
rename to tests/language_2/null_aware/assignment_runtime_10_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_11_test.dart b/tests/language_2/null_aware/assignment_runtime_11_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_11_test.dart
rename to tests/language_2/null_aware/assignment_runtime_11_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_12_test.dart b/tests/language_2/null_aware/assignment_runtime_12_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_12_test.dart
rename to tests/language_2/null_aware/assignment_runtime_12_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_13_test.dart b/tests/language_2/null_aware/assignment_runtime_13_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_13_test.dart
rename to tests/language_2/null_aware/assignment_runtime_13_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_1_test.dart b/tests/language_2/null_aware/assignment_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_1_test.dart
rename to tests/language_2/null_aware/assignment_runtime_1_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_2_test.dart b/tests/language_2/null_aware/assignment_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_2_test.dart
rename to tests/language_2/null_aware/assignment_runtime_2_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_3_test.dart b/tests/language_2/null_aware/assignment_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_3_test.dart
rename to tests/language_2/null_aware/assignment_runtime_3_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_4_test.dart b/tests/language_2/null_aware/assignment_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_4_test.dart
rename to tests/language_2/null_aware/assignment_runtime_4_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_5_test.dart b/tests/language_2/null_aware/assignment_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_5_test.dart
rename to tests/language_2/null_aware/assignment_runtime_5_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_6_test.dart b/tests/language_2/null_aware/assignment_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_6_test.dart
rename to tests/language_2/null_aware/assignment_runtime_6_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_7_test.dart b/tests/language_2/null_aware/assignment_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_7_test.dart
rename to tests/language_2/null_aware/assignment_runtime_7_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_8_test.dart b/tests/language_2/null_aware/assignment_runtime_8_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_8_test.dart
rename to tests/language_2/null_aware/assignment_runtime_8_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_9_test.dart b/tests/language_2/null_aware/assignment_runtime_9_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_9_test.dart
rename to tests/language_2/null_aware/assignment_runtime_9_test.dart
diff --git a/tests/language_2/conditional_property_assignment_runtime_test.dart b/tests/language_2/null_aware/assignment_runtime_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_runtime_test.dart
rename to tests/language_2/null_aware/assignment_runtime_test.dart
diff --git a/tests/language_2/conditional_property_assignment_test.dart b/tests/language_2/null_aware/assignment_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_assignment_test.dart
rename to tests/language_2/null_aware/assignment_test.dart
diff --git a/tests/language_2/conditional_access_helper.dart b/tests/language_2/null_aware/conditional_access_helper.dart
similarity index 100%
rename from tests/language_2/conditional_access_helper.dart
rename to tests/language_2/null_aware/conditional_access_helper.dart
diff --git a/tests/language_2/nullaware_dynamic_test.dart b/tests/language_2/null_aware/dynamic_test.dart
similarity index 100%
rename from tests/language_2/nullaware_dynamic_test.dart
rename to tests/language_2/null_aware/dynamic_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_10_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_10_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_10_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_10_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_11_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_11_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_11_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_11_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_12_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_12_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_12_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_12_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_13_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_13_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_13_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_13_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_14_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_14_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_14_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_14_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_15_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_15_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_15_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_15_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_16_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_16_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_16_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_16_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_17_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_17_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_17_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_17_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_18_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_18_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_18_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_18_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_19_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_19_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_19_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_19_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_1_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_1_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_1_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_20_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_20_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_20_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_20_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_21_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_21_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_21_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_21_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_22_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_22_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_22_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_22_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_23_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_23_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_23_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_23_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_24_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_24_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_24_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_24_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_25_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_25_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_25_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_25_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_26_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_26_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_26_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_26_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_27_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_27_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_27_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_27_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_28_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_28_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_28_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_28_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_2_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_2_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_2_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_3_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_3_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_3_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_4_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_4_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_4_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_5_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_5_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_5_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_6_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_6_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_6_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_7_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_7_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_7_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_8_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_8_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_8_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_8_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_9_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_9_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_9_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_9_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_runtime_test.dart b/tests/language_2/null_aware/increment_decrement_runtime_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_runtime_test.dart
rename to tests/language_2/null_aware/increment_decrement_runtime_test.dart
diff --git a/tests/language_2/conditional_property_increment_decrement_test.dart b/tests/language_2/null_aware/increment_decrement_test.dart
similarity index 100%
rename from tests/language_2/conditional_property_increment_decrement_test.dart
rename to tests/language_2/null_aware/increment_decrement_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_1_test.dart b/tests/language_2/null_aware/invocation_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_1_test.dart
rename to tests/language_2/null_aware/invocation_runtime_1_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_2_test.dart b/tests/language_2/null_aware/invocation_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_2_test.dart
rename to tests/language_2/null_aware/invocation_runtime_2_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_3_test.dart b/tests/language_2/null_aware/invocation_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_3_test.dart
rename to tests/language_2/null_aware/invocation_runtime_3_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_4_test.dart b/tests/language_2/null_aware/invocation_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_4_test.dart
rename to tests/language_2/null_aware/invocation_runtime_4_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_5_test.dart b/tests/language_2/null_aware/invocation_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_5_test.dart
rename to tests/language_2/null_aware/invocation_runtime_5_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_6_test.dart b/tests/language_2/null_aware/invocation_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_6_test.dart
rename to tests/language_2/null_aware/invocation_runtime_6_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_7_test.dart b/tests/language_2/null_aware/invocation_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_7_test.dart
rename to tests/language_2/null_aware/invocation_runtime_7_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_8_test.dart b/tests/language_2/null_aware/invocation_runtime_8_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_8_test.dart
rename to tests/language_2/null_aware/invocation_runtime_8_test.dart
diff --git a/tests/language_2/conditional_method_invocation_runtime_test.dart b/tests/language_2/null_aware/invocation_runtime_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_runtime_test.dart
rename to tests/language_2/null_aware/invocation_runtime_test.dart
diff --git a/tests/language_2/conditional_method_invocation_test.dart b/tests/language_2/null_aware/invocation_test.dart
similarity index 100%
rename from tests/language_2/conditional_method_invocation_test.dart
rename to tests/language_2/null_aware/invocation_test.dart
diff --git a/tests/language_2/nullaware_opt_test.dart b/tests/language_2/null_aware/opt_test.dart
similarity index 100%
rename from tests/language_2/nullaware_opt_test.dart
rename to tests/language_2/null_aware/opt_test.dart
diff --git a/tests/language_2/number_constant_folding1_test.dart b/tests/language_2/number/constant_folding1_test.dart
similarity index 100%
rename from tests/language_2/number_constant_folding1_test.dart
rename to tests/language_2/number/constant_folding1_test.dart
diff --git a/tests/language_2/number_identifier_runtime_test.dart b/tests/language_2/number/identifier_runtime_test.dart
similarity index 100%
rename from tests/language_2/number_identifier_runtime_test.dart
rename to tests/language_2/number/identifier_runtime_test.dart
diff --git a/tests/language_2/number_identifier_test.dart b/tests/language_2/number/identifier_test.dart
similarity index 100%
rename from tests/language_2/number_identifier_test.dart
rename to tests/language_2/number/identifier_test.dart
diff --git a/tests/language_2/number_identity2_test.dart b/tests/language_2/number/identity2_test.dart
similarity index 100%
rename from tests/language_2/number_identity2_test.dart
rename to tests/language_2/number/identity2_test.dart
diff --git a/tests/language_2/number_identity_test.dart b/tests/language_2/number/identity_test.dart
similarity index 100%
rename from tests/language_2/number_identity_test.dart
rename to tests/language_2/number/identity_test.dart
diff --git a/tests/language_2/infinity_test.dart b/tests/language_2/number/infinity_test.dart
similarity index 100%
rename from tests/language_2/infinity_test.dart
rename to tests/language_2/number/infinity_test.dart
diff --git a/tests/language_2/int2_test.dart b/tests/language_2/number/int2_test.dart
similarity index 100%
rename from tests/language_2/int2_test.dart
rename to tests/language_2/number/int2_test.dart
diff --git a/tests/language_2/int64_literal_runtime_10_test.dart b/tests/language_2/number/int64_literal_runtime_10_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_10_test.dart
rename to tests/language_2/number/int64_literal_runtime_10_test.dart
diff --git a/tests/language_2/int64_literal_runtime_11_test.dart b/tests/language_2/number/int64_literal_runtime_11_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_11_test.dart
rename to tests/language_2/number/int64_literal_runtime_11_test.dart
diff --git a/tests/language_2/int64_literal_runtime_1_test.dart b/tests/language_2/number/int64_literal_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_1_test.dart
rename to tests/language_2/number/int64_literal_runtime_1_test.dart
diff --git a/tests/language_2/int64_literal_runtime_2_test.dart b/tests/language_2/number/int64_literal_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_2_test.dart
rename to tests/language_2/number/int64_literal_runtime_2_test.dart
diff --git a/tests/language_2/int64_literal_runtime_3_test.dart b/tests/language_2/number/int64_literal_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_3_test.dart
rename to tests/language_2/number/int64_literal_runtime_3_test.dart
diff --git a/tests/language_2/int64_literal_runtime_4_test.dart b/tests/language_2/number/int64_literal_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_4_test.dart
rename to tests/language_2/number/int64_literal_runtime_4_test.dart
diff --git a/tests/language_2/int64_literal_runtime_5_test.dart b/tests/language_2/number/int64_literal_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_5_test.dart
rename to tests/language_2/number/int64_literal_runtime_5_test.dart
diff --git a/tests/language_2/int64_literal_runtime_6_test.dart b/tests/language_2/number/int64_literal_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_6_test.dart
rename to tests/language_2/number/int64_literal_runtime_6_test.dart
diff --git a/tests/language_2/int64_literal_runtime_7_test.dart b/tests/language_2/number/int64_literal_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_7_test.dart
rename to tests/language_2/number/int64_literal_runtime_7_test.dart
diff --git a/tests/language_2/int64_literal_runtime_8_test.dart b/tests/language_2/number/int64_literal_runtime_8_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_8_test.dart
rename to tests/language_2/number/int64_literal_runtime_8_test.dart
diff --git a/tests/language_2/int64_literal_runtime_9_test.dart b/tests/language_2/number/int64_literal_runtime_9_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_9_test.dart
rename to tests/language_2/number/int64_literal_runtime_9_test.dart
diff --git a/tests/language_2/int64_literal_runtime_test.dart b/tests/language_2/number/int64_literal_runtime_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_runtime_test.dart
rename to tests/language_2/number/int64_literal_runtime_test.dart
diff --git a/tests/language_2/int64_literal_test.dart b/tests/language_2/number/int64_literal_test.dart
similarity index 100%
rename from tests/language_2/int64_literal_test.dart
rename to tests/language_2/number/int64_literal_test.dart
diff --git a/tests/language_2/int_test.dart b/tests/language_2/number/int_test.dart
similarity index 100%
rename from tests/language_2/int_test.dart
rename to tests/language_2/number/int_test.dart
diff --git a/tests/language_2/numbers_test.dart b/tests/language_2/number/numbers_test.dart
similarity index 100%
rename from tests/language_2/numbers_test.dart
rename to tests/language_2/number/numbers_test.dart
diff --git a/tests/language_2/number_syntax_test.dart b/tests/language_2/number/syntax_test.dart
similarity index 100%
rename from tests/language_2/number_syntax_test.dart
rename to tests/language_2/number/syntax_test.dart
diff --git a/tests/language_2/web_int_literals_runtime_test.dart b/tests/language_2/number/web_int_literals_runtime_test.dart
similarity index 100%
rename from tests/language_2/web_int_literals_runtime_test.dart
rename to tests/language_2/number/web_int_literals_runtime_test.dart
diff --git a/tests/language_2/web_int_literals_test.dart b/tests/language_2/number/web_int_literals_test.dart
similarity index 100%
rename from tests/language_2/web_int_literals_test.dart
rename to tests/language_2/number/web_int_literals_test.dart
diff --git a/tests/language_2/and_operation_on_non_integer_operand_test.dart b/tests/language_2/operator/and_operation_on_non_integer_operand_test.dart
similarity index 100%
rename from tests/language_2/and_operation_on_non_integer_operand_test.dart
rename to tests/language_2/operator/and_operation_on_non_integer_operand_test.dart
diff --git a/tests/language_2/arithmetic_canonicalization_test.dart b/tests/language_2/operator/arithmetic_canonicalization_test.dart
similarity index 100%
rename from tests/language_2/arithmetic_canonicalization_test.dart
rename to tests/language_2/operator/arithmetic_canonicalization_test.dart
diff --git a/tests/language_2/arithmetic_int64_test.dart b/tests/language_2/operator/arithmetic_int64_test.dart
similarity index 100%
rename from tests/language_2/arithmetic_int64_test.dart
rename to tests/language_2/operator/arithmetic_int64_test.dart
diff --git a/tests/language_2/arithmetic_smi_overflow_test.dart b/tests/language_2/operator/arithmetic_smi_overflow_test.dart
similarity index 100%
rename from tests/language_2/arithmetic_smi_overflow_test.dart
rename to tests/language_2/operator/arithmetic_smi_overflow_test.dart
diff --git a/tests/language_2/arithmetic_test.dart b/tests/language_2/operator/arithmetic_test.dart
similarity index 100%
rename from tests/language_2/arithmetic_test.dart
rename to tests/language_2/operator/arithmetic_test.dart
diff --git a/tests/language_2/bit_operations_test.dart b/tests/language_2/operator/bit_operations_test.dart
similarity index 100%
rename from tests/language_2/bit_operations_test.dart
rename to tests/language_2/operator/bit_operations_test.dart
diff --git a/tests/language_2/bit_shift_test.dart b/tests/language_2/operator/bit_shift_test.dart
similarity index 100%
rename from tests/language_2/bit_shift_test.dart
rename to tests/language_2/operator/bit_shift_test.dart
diff --git a/tests/language_2/comparison_test.dart b/tests/language_2/operator/comparison_test.dart
similarity index 100%
rename from tests/language_2/comparison_test.dart
rename to tests/language_2/operator/comparison_test.dart
diff --git a/tests/language_2/compound_assignment_operator_test.dart b/tests/language_2/operator/compound_assignment_test.dart
similarity index 100%
rename from tests/language_2/compound_assignment_operator_test.dart
rename to tests/language_2/operator/compound_assignment_test.dart
diff --git a/tests/language_2/cond_expr_test.dart b/tests/language_2/operator/cond_expr_test.dart
similarity index 100%
rename from tests/language_2/cond_expr_test.dart
rename to tests/language_2/operator/cond_expr_test.dart
diff --git a/tests/language_2/div_by_zero_test.dart b/tests/language_2/operator/div_by_zero_test.dart
similarity index 100%
rename from tests/language_2/div_by_zero_test.dart
rename to tests/language_2/operator/div_by_zero_test.dart
diff --git a/tests/language_2/div_with_power_of_two2_test.dart b/tests/language_2/operator/div_with_power_of_two2_test.dart
similarity index 100%
rename from tests/language_2/div_with_power_of_two2_test.dart
rename to tests/language_2/operator/div_with_power_of_two2_test.dart
diff --git a/tests/language_2/div_with_power_of_two_test.dart b/tests/language_2/operator/div_with_power_of_two_test.dart
similarity index 100%
rename from tests/language_2/div_with_power_of_two_test.dart
rename to tests/language_2/operator/div_with_power_of_two_test.dart
diff --git a/tests/language_2/equality_test.dart b/tests/language_2/operator/equality_test.dart
similarity index 100%
rename from tests/language_2/equality_test.dart
rename to tests/language_2/operator/equality_test.dart
diff --git a/tests/language_2/operator_equals_test.dart b/tests/language_2/operator/equals_test.dart
similarity index 100%
rename from tests/language_2/operator_equals_test.dart
rename to tests/language_2/operator/equals_test.dart
diff --git a/tests/language_2/incr_op_test.dart b/tests/language_2/operator/incr_op_test.dart
similarity index 100%
rename from tests/language_2/incr_op_test.dart
rename to tests/language_2/operator/incr_op_test.dart
diff --git a/tests/language_2/operator_index_evaluation_order_test.dart b/tests/language_2/operator/index_evaluation_order_test.dart
similarity index 100%
rename from tests/language_2/operator_index_evaluation_order_test.dart
rename to tests/language_2/operator/index_evaluation_order_test.dart
diff --git a/tests/language_2/index_test.dart b/tests/language_2/operator/index_test.dart
similarity index 100%
rename from tests/language_2/index_test.dart
rename to tests/language_2/operator/index_test.dart
diff --git a/tests/language_2/integer_division_by_zero_test.dart b/tests/language_2/operator/integer_division_by_zero_test.dart
similarity index 100%
rename from tests/language_2/integer_division_by_zero_test.dart
rename to tests/language_2/operator/integer_division_by_zero_test.dart
diff --git a/tests/language_2/invalid_assignment_to_postfix_increment_runtime_test.dart b/tests/language_2/operator/invalid_assignment_to_postfix_increment_runtime_test.dart
similarity index 100%
rename from tests/language_2/invalid_assignment_to_postfix_increment_runtime_test.dart
rename to tests/language_2/operator/invalid_assignment_to_postfix_increment_runtime_test.dart
diff --git a/tests/language_2/invalid_assignment_to_postfix_increment_test.dart b/tests/language_2/operator/invalid_assignment_to_postfix_increment_test.dart
similarity index 100%
rename from tests/language_2/invalid_assignment_to_postfix_increment_test.dart
rename to tests/language_2/operator/invalid_assignment_to_postfix_increment_test.dart
diff --git a/tests/language_2/left_shift_test.dart b/tests/language_2/operator/left_shift_test.dart
similarity index 100%
rename from tests/language_2/left_shift_test.dart
rename to tests/language_2/operator/left_shift_test.dart
diff --git a/tests/language_2/literal_unary_plus_test.dart b/tests/language_2/operator/literal_unary_plus_test.dart
similarity index 100%
rename from tests/language_2/literal_unary_plus_test.dart
rename to tests/language_2/operator/literal_unary_plus_test.dart
diff --git a/tests/language_2/logical_expression2_test.dart b/tests/language_2/operator/logical_expression2_test.dart
similarity index 100%
rename from tests/language_2/logical_expression2_test.dart
rename to tests/language_2/operator/logical_expression2_test.dart
diff --git a/tests/language_2/logical_expression3_test.dart b/tests/language_2/operator/logical_expression3_test.dart
similarity index 100%
rename from tests/language_2/logical_expression3_test.dart
rename to tests/language_2/operator/logical_expression3_test.dart
diff --git a/tests/language_2/logical_expression4_test.dart b/tests/language_2/operator/logical_expression4_test.dart
similarity index 100%
rename from tests/language_2/logical_expression4_test.dart
rename to tests/language_2/operator/logical_expression4_test.dart
diff --git a/tests/language_2/logical_expression5_test.dart b/tests/language_2/operator/logical_expression5_test.dart
similarity index 100%
rename from tests/language_2/logical_expression5_test.dart
rename to tests/language_2/operator/logical_expression5_test.dart
diff --git a/tests/language_2/logical_expression_test.dart b/tests/language_2/operator/logical_expression_test.dart
similarity index 100%
rename from tests/language_2/logical_expression_test.dart
rename to tests/language_2/operator/logical_expression_test.dart
diff --git a/tests/language_2/mint_arithmetic_test.dart b/tests/language_2/operator/mint_arithmetic_test.dart
similarity index 100%
rename from tests/language_2/mint_arithmetic_test.dart
rename to tests/language_2/operator/mint_arithmetic_test.dart
diff --git a/tests/language_2/modulo_test.dart b/tests/language_2/operator/modulo_test.dart
similarity index 100%
rename from tests/language_2/modulo_test.dart
rename to tests/language_2/operator/modulo_test.dart
diff --git a/tests/language_2/mul_recipr_test.dart b/tests/language_2/operator/mul_recipr_test.dart
similarity index 100%
rename from tests/language_2/mul_recipr_test.dart
rename to tests/language_2/operator/mul_recipr_test.dart
diff --git a/tests/language_2/multi_assign_test.dart b/tests/language_2/operator/multi_assign_test.dart
similarity index 100%
rename from tests/language_2/multi_assign_test.dart
rename to tests/language_2/operator/multi_assign_test.dart
diff --git a/tests/language_2/operator_negate_and_method_negate_test.dart b/tests/language_2/operator/negate_and_method_negate_test.dart
similarity index 100%
rename from tests/language_2/operator_negate_and_method_negate_test.dart
rename to tests/language_2/operator/negate_and_method_negate_test.dart
diff --git a/tests/language_2/operations_on_non_num_operand_test.dart b/tests/language_2/operator/operations_on_non_num_operand_test.dart
similarity index 100%
rename from tests/language_2/operations_on_non_num_operand_test.dart
rename to tests/language_2/operator/operations_on_non_num_operand_test.dart
diff --git a/tests/language_2/operator1_test.dart b/tests/language_2/operator/operator1_test.dart
similarity index 100%
rename from tests/language_2/operator1_test.dart
rename to tests/language_2/operator/operator1_test.dart
diff --git a/tests/language_2/operator2_test.dart b/tests/language_2/operator/operator2_test.dart
similarity index 100%
rename from tests/language_2/operator2_test.dart
rename to tests/language_2/operator/operator2_test.dart
diff --git a/tests/language_2/operator3_test.dart b/tests/language_2/operator/operator3_test.dart
similarity index 100%
rename from tests/language_2/operator3_test.dart
rename to tests/language_2/operator/operator3_test.dart
diff --git a/tests/language_2/operator4_test.dart b/tests/language_2/operator/operator4_test.dart
similarity index 100%
rename from tests/language_2/operator4_test.dart
rename to tests/language_2/operator/operator4_test.dart
diff --git a/tests/language_2/operator5_test.dart b/tests/language_2/operator/operator5_test.dart
similarity index 100%
rename from tests/language_2/operator5_test.dart
rename to tests/language_2/operator/operator5_test.dart
diff --git a/tests/language_2/operator6_test.dart b/tests/language_2/operator/operator6_test.dart
similarity index 100%
rename from tests/language_2/operator6_test.dart
rename to tests/language_2/operator/operator6_test.dart
diff --git a/tests/language_2/operator7_test.dart b/tests/language_2/operator/operator7_test.dart
similarity index 100%
rename from tests/language_2/operator7_test.dart
rename to tests/language_2/operator/operator7_test.dart
diff --git a/tests/language_2/operator_test.dart b/tests/language_2/operator/operator_test.dart
similarity index 100%
rename from tests/language_2/operator_test.dart
rename to tests/language_2/operator/operator_test.dart
diff --git a/tests/language_2/positive_bit_operations_test.dart b/tests/language_2/operator/positive_bit_operations_test.dart
similarity index 100%
rename from tests/language_2/positive_bit_operations_test.dart
rename to tests/language_2/operator/positive_bit_operations_test.dart
diff --git a/tests/language_2/precedence_test.dart b/tests/language_2/operator/precedence_test.dart
similarity index 100%
rename from tests/language_2/precedence_test.dart
rename to tests/language_2/operator/precedence_test.dart
diff --git a/tests/language_2/round_test.dart b/tests/language_2/operator/round_test.dart
similarity index 100%
rename from tests/language_2/round_test.dart
rename to tests/language_2/operator/round_test.dart
diff --git a/tests/language_2/smi_type_test.dart b/tests/language_2/operator/smi_type_test.dart
similarity index 100%
rename from tests/language_2/smi_type_test.dart
rename to tests/language_2/operator/smi_type_test.dart
diff --git a/tests/language_2/ternary_test.dart b/tests/language_2/operator/ternary_test.dart
similarity index 100%
rename from tests/language_2/ternary_test.dart
rename to tests/language_2/operator/ternary_test.dart
diff --git a/tests/language_2/truncdiv_test.dart b/tests/language_2/operator/truncdiv_test.dart
similarity index 100%
rename from tests/language_2/truncdiv_test.dart
rename to tests/language_2/operator/truncdiv_test.dart
diff --git a/tests/language_2/truncdiv_uint32_test.dart b/tests/language_2/operator/truncdiv_uint32_test.dart
similarity index 100%
rename from tests/language_2/truncdiv_uint32_test.dart
rename to tests/language_2/operator/truncdiv_uint32_test.dart
diff --git a/tests/language_2/truncdiv_zero_test.dart b/tests/language_2/operator/truncdiv_zero_test.dart
similarity index 100%
rename from tests/language_2/truncdiv_zero_test.dart
rename to tests/language_2/operator/truncdiv_zero_test.dart
diff --git a/tests/language_2/unary2_test.dart b/tests/language_2/operator/unary2_test.dart
similarity index 100%
rename from tests/language_2/unary2_test.dart
rename to tests/language_2/operator/unary2_test.dart
diff --git a/tests/language_2/unary_plus_test.dart b/tests/language_2/operator/unary_plus_test.dart
similarity index 100%
rename from tests/language_2/unary_plus_test.dart
rename to tests/language_2/operator/unary_plus_test.dart
diff --git a/tests/language_2/unary_test.dart b/tests/language_2/operator/unary_test.dart
similarity index 100%
rename from tests/language_2/unary_test.dart
rename to tests/language_2/operator/unary_test.dart
diff --git a/tests/language_2/unsigned_right_shift_test.dart b/tests/language_2/operator/unsigned_right_shift_test.dart
similarity index 100%
rename from tests/language_2/unsigned_right_shift_test.dart
rename to tests/language_2/operator/unsigned_right_shift_test.dart
diff --git a/tests/language_2/unsupported_operators_runtime_test.dart b/tests/language_2/operator/unsupported_runtime_test.dart
similarity index 100%
rename from tests/language_2/unsupported_operators_runtime_test.dart
rename to tests/language_2/operator/unsupported_runtime_test.dart
diff --git a/tests/language_2/unsupported_operators_test.dart b/tests/language_2/operator/unsupported_test.dart
similarity index 100%
rename from tests/language_2/unsupported_operators_test.dart
rename to tests/language_2/operator/unsupported_test.dart
diff --git a/tests/language_2/allocation_sinking_inlining_test.dart b/tests/language_2/optimize/allocation_sinking_inlining_test.dart
similarity index 100%
rename from tests/language_2/allocation_sinking_inlining_test.dart
rename to tests/language_2/optimize/allocation_sinking_inlining_test.dart
diff --git a/tests/language_2/bailout2_test.dart b/tests/language_2/optimize/bailout2_test.dart
similarity index 100%
rename from tests/language_2/bailout2_test.dart
rename to tests/language_2/optimize/bailout2_test.dart
diff --git a/tests/language_2/bailout3_test.dart b/tests/language_2/optimize/bailout3_test.dart
similarity index 100%
rename from tests/language_2/bailout3_test.dart
rename to tests/language_2/optimize/bailout3_test.dart
diff --git a/tests/language_2/bailout4_test.dart b/tests/language_2/optimize/bailout4_test.dart
similarity index 100%
rename from tests/language_2/bailout4_test.dart
rename to tests/language_2/optimize/bailout4_test.dart
diff --git a/tests/language_2/bailout5_test.dart b/tests/language_2/optimize/bailout5_test.dart
similarity index 100%
rename from tests/language_2/bailout5_test.dart
rename to tests/language_2/optimize/bailout5_test.dart
diff --git a/tests/language_2/bailout6_test.dart b/tests/language_2/optimize/bailout6_test.dart
similarity index 100%
rename from tests/language_2/bailout6_test.dart
rename to tests/language_2/optimize/bailout6_test.dart
diff --git a/tests/language_2/bailout7_test.dart b/tests/language_2/optimize/bailout7_test.dart
similarity index 100%
rename from tests/language_2/bailout7_test.dart
rename to tests/language_2/optimize/bailout7_test.dart
diff --git a/tests/language_2/bailout_container_type_test.dart b/tests/language_2/optimize/bailout_container_type_test.dart
similarity index 100%
rename from tests/language_2/bailout_container_type_test.dart
rename to tests/language_2/optimize/bailout_container_type_test.dart
diff --git a/tests/language_2/bailout_test.dart b/tests/language_2/optimize/bailout_test.dart
similarity index 100%
rename from tests/language_2/bailout_test.dart
rename to tests/language_2/optimize/bailout_test.dart
diff --git a/tests/language_2/cha_deopt1_deferred_lib.dart b/tests/language_2/optimize/cha_deopt1_deferred_lib.dart
similarity index 100%
rename from tests/language_2/cha_deopt1_deferred_lib.dart
rename to tests/language_2/optimize/cha_deopt1_deferred_lib.dart
diff --git a/tests/language_2/cha_deopt1_lib.dart b/tests/language_2/optimize/cha_deopt1_lib.dart
similarity index 100%
rename from tests/language_2/cha_deopt1_lib.dart
rename to tests/language_2/optimize/cha_deopt1_lib.dart
diff --git a/tests/language_2/cha_deopt1_test.dart b/tests/language_2/optimize/cha_deopt1_test.dart
similarity index 100%
rename from tests/language_2/cha_deopt1_test.dart
rename to tests/language_2/optimize/cha_deopt1_test.dart
diff --git a/tests/language_2/cha_deopt2_deferred_lib.dart b/tests/language_2/optimize/cha_deopt2_deferred_lib.dart
similarity index 100%
rename from tests/language_2/cha_deopt2_deferred_lib.dart
rename to tests/language_2/optimize/cha_deopt2_deferred_lib.dart
diff --git a/tests/language_2/cha_deopt2_lib.dart b/tests/language_2/optimize/cha_deopt2_lib.dart
similarity index 100%
rename from tests/language_2/cha_deopt2_lib.dart
rename to tests/language_2/optimize/cha_deopt2_lib.dart
diff --git a/tests/language_2/cha_deopt2_test.dart b/tests/language_2/optimize/cha_deopt2_test.dart
similarity index 100%
rename from tests/language_2/cha_deopt2_test.dart
rename to tests/language_2/optimize/cha_deopt2_test.dart
diff --git a/tests/language_2/cha_deopt3_deferred_lib.dart b/tests/language_2/optimize/cha_deopt3_deferred_lib.dart
similarity index 100%
rename from tests/language_2/cha_deopt3_deferred_lib.dart
rename to tests/language_2/optimize/cha_deopt3_deferred_lib.dart
diff --git a/tests/language_2/cha_deopt3_lib.dart b/tests/language_2/optimize/cha_deopt3_lib.dart
similarity index 100%
rename from tests/language_2/cha_deopt3_lib.dart
rename to tests/language_2/optimize/cha_deopt3_lib.dart
diff --git a/tests/language_2/cha_deopt3_test.dart b/tests/language_2/optimize/cha_deopt3_test.dart
similarity index 100%
rename from tests/language_2/cha_deopt3_test.dart
rename to tests/language_2/optimize/cha_deopt3_test.dart
diff --git a/tests/language_2/code_motion_crash_test.dart b/tests/language_2/optimize/code_motion_crash_test.dart
similarity index 100%
rename from tests/language_2/code_motion_crash_test.dart
rename to tests/language_2/optimize/code_motion_crash_test.dart
diff --git a/tests/language_2/optimized_constant_array_string_access_test.dart b/tests/language_2/optimize/constant_array_string_access_test.dart
similarity index 100%
rename from tests/language_2/optimized_constant_array_string_access_test.dart
rename to tests/language_2/optimize/constant_array_string_access_test.dart
diff --git a/tests/language_2/constant_fold_equals_test.dart b/tests/language_2/optimize/constant_fold_equals_test.dart
similarity index 100%
rename from tests/language_2/constant_fold_equals_test.dart
rename to tests/language_2/optimize/constant_fold_equals_test.dart
diff --git a/tests/language_2/constant_propagation_phis_test.dart b/tests/language_2/optimize/constant_propagation_phis_test.dart
similarity index 100%
rename from tests/language_2/constant_propagation_phis_test.dart
rename to tests/language_2/optimize/constant_propagation_phis_test.dart
diff --git a/tests/language_2/critical_edge2_test.dart b/tests/language_2/optimize/critical_edge2_test.dart
similarity index 100%
rename from tests/language_2/critical_edge2_test.dart
rename to tests/language_2/optimize/critical_edge2_test.dart
diff --git a/tests/language_2/critical_edge_test.dart b/tests/language_2/optimize/critical_edge_test.dart
similarity index 100%
rename from tests/language_2/critical_edge_test.dart
rename to tests/language_2/optimize/critical_edge_test.dart
diff --git a/tests/language_2/dead_field_access_test.dart b/tests/language_2/optimize/dead_field_access_test.dart
similarity index 100%
rename from tests/language_2/dead_field_access_test.dart
rename to tests/language_2/optimize/dead_field_access_test.dart
diff --git a/tests/language_2/deopt_inlined_function_lazy_test.dart b/tests/language_2/optimize/deopt_inlined_function_lazy_test.dart
similarity index 100%
rename from tests/language_2/deopt_inlined_function_lazy_test.dart
rename to tests/language_2/optimize/deopt_inlined_function_lazy_test.dart
diff --git a/tests/language_2/deopt_inlined_function_test.dart b/tests/language_2/optimize/deopt_inlined_function_test.dart
similarity index 100%
rename from tests/language_2/deopt_inlined_function_test.dart
rename to tests/language_2/optimize/deopt_inlined_function_test.dart
diff --git a/tests/language_2/deopt_lazy_finalization_test.dart b/tests/language_2/optimize/deopt_lazy_finalization_test.dart
similarity index 100%
rename from tests/language_2/deopt_lazy_finalization_test.dart
rename to tests/language_2/optimize/deopt_lazy_finalization_test.dart
diff --git a/tests/language_2/deopt_no_feedback_test.dart b/tests/language_2/optimize/deopt_no_feedback_test.dart
similarity index 100%
rename from tests/language_2/deopt_no_feedback_test.dart
rename to tests/language_2/optimize/deopt_no_feedback_test.dart
diff --git a/tests/language_2/deopt_smi_op_test.dart b/tests/language_2/optimize/deopt_smi_op_test.dart
similarity index 100%
rename from tests/language_2/deopt_smi_op_test.dart
rename to tests/language_2/optimize/deopt_smi_op_test.dart
diff --git a/tests/language_2/deoptimized_function_on_stack_test.dart b/tests/language_2/optimize/deoptimized_function_on_stack_test.dart
similarity index 100%
rename from tests/language_2/deoptimized_function_on_stack_test.dart
rename to tests/language_2/optimize/deoptimized_function_on_stack_test.dart
diff --git a/tests/language_2/optimized_hoisting_checked_mode_assert_test.dart b/tests/language_2/optimize/hoisting_checked_mode_assert_test.dart
similarity index 100%
rename from tests/language_2/optimized_hoisting_checked_mode_assert_test.dart
rename to tests/language_2/optimize/hoisting_checked_mode_assert_test.dart
diff --git a/tests/language_2/inferrer_closure_test.dart b/tests/language_2/optimize/inferrer_closure_test.dart
similarity index 100%
rename from tests/language_2/inferrer_closure_test.dart
rename to tests/language_2/optimize/inferrer_closure_test.dart
diff --git a/tests/language_2/inferrer_constructor2_test.dart b/tests/language_2/optimize/inferrer_constructor2_test.dart
similarity index 97%
rename from tests/language_2/inferrer_constructor2_test.dart
rename to tests/language_2/optimize/inferrer_constructor2_test.dart
index 3e8425af72f..58da3ada16f 100644
--- a/tests/language_2/inferrer_constructor2_test.dart
+++ b/tests/language_2/optimize/inferrer_constructor2_test.dart
@@ -7,7 +7,7 @@
 // inlined.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 class A {
   var foo;
diff --git a/tests/language_2/inferrer_constructor3_test.dart b/tests/language_2/optimize/inferrer_constructor3_test.dart
similarity index 95%
rename from tests/language_2/inferrer_constructor3_test.dart
rename to tests/language_2/optimize/inferrer_constructor3_test.dart
index 2620083ae1a..f40676d91da 100644
--- a/tests/language_2/inferrer_constructor3_test.dart
+++ b/tests/language_2/optimize/inferrer_constructor3_test.dart
@@ -7,7 +7,7 @@
 // inlined.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 class A {
   var field;
diff --git a/tests/language_2/inferrer_constructor4_test.dart b/tests/language_2/optimize/inferrer_constructor4_test.dart
similarity index 100%
rename from tests/language_2/inferrer_constructor4_test.dart
rename to tests/language_2/optimize/inferrer_constructor4_test.dart
diff --git a/tests/language_2/inferrer_constructor5_runtime_test.dart b/tests/language_2/optimize/inferrer_constructor5_runtime_test.dart
similarity index 100%
rename from tests/language_2/inferrer_constructor5_runtime_test.dart
rename to tests/language_2/optimize/inferrer_constructor5_runtime_test.dart
diff --git a/tests/language_2/inferrer_constructor5_test.dart b/tests/language_2/optimize/inferrer_constructor5_test.dart
similarity index 100%
rename from tests/language_2/inferrer_constructor5_test.dart
rename to tests/language_2/optimize/inferrer_constructor5_test.dart
diff --git a/tests/language_2/inferrer_constructor_test.dart b/tests/language_2/optimize/inferrer_constructor_test.dart
similarity index 100%
rename from tests/language_2/inferrer_constructor_test.dart
rename to tests/language_2/optimize/inferrer_constructor_test.dart
diff --git a/tests/language_2/inferrer_named_parameter_test.dart b/tests/language_2/optimize/inferrer_named_parameter_test.dart
similarity index 92%
rename from tests/language_2/inferrer_named_parameter_test.dart
rename to tests/language_2/optimize/inferrer_named_parameter_test.dart
index 780e90525ed..a6655b4fb00 100644
--- a/tests/language_2/inferrer_named_parameter_test.dart
+++ b/tests/language_2/optimize/inferrer_named_parameter_test.dart
@@ -6,7 +6,7 @@
 // correctly infer optional named parameters.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 @DontInline()
 foo({path}) {
diff --git a/tests/language_2/inferrer_synthesized_constructor_test.dart b/tests/language_2/optimize/inferrer_synthesized_constructor_test.dart
similarity index 100%
rename from tests/language_2/inferrer_synthesized_constructor_test.dart
rename to tests/language_2/optimize/inferrer_synthesized_constructor_test.dart
diff --git a/tests/language_2/inferrer_synthesized_super_constructor2_test.dart b/tests/language_2/optimize/inferrer_synthesized_super_constructor2_test.dart
similarity index 100%
rename from tests/language_2/inferrer_synthesized_super_constructor2_test.dart
rename to tests/language_2/optimize/inferrer_synthesized_super_constructor2_test.dart
diff --git a/tests/language_2/inferrer_synthesized_super_constructor_test.dart b/tests/language_2/optimize/inferrer_synthesized_super_constructor_test.dart
similarity index 90%
rename from tests/language_2/inferrer_synthesized_super_constructor_test.dart
rename to tests/language_2/optimize/inferrer_synthesized_super_constructor_test.dart
index ccffde991de..1a7284bd02c 100644
--- a/tests/language_2/inferrer_synthesized_super_constructor_test.dart
+++ b/tests/language_2/optimize/inferrer_synthesized_super_constructor_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'compiler_annotations.dart';
+import '../compiler_annotations.dart';
 
 class A {
   @DontInline()
diff --git a/tests/language_2/inferrer_this_access_test.dart b/tests/language_2/optimize/inferrer_this_access_test.dart
similarity index 100%
rename from tests/language_2/inferrer_this_access_test.dart
rename to tests/language_2/optimize/inferrer_this_access_test.dart
diff --git a/tests/language_2/inline_add_constants_to_initial_env_test.dart b/tests/language_2/optimize/inline_add_constants_to_initial_env_test.dart
similarity index 100%
rename from tests/language_2/inline_add_constants_to_initial_env_test.dart
rename to tests/language_2/optimize/inline_add_constants_to_initial_env_test.dart
diff --git a/tests/language_2/inline_argument_test.dart b/tests/language_2/optimize/inline_argument_test.dart
similarity index 100%
rename from tests/language_2/inline_argument_test.dart
rename to tests/language_2/optimize/inline_argument_test.dart
diff --git a/tests/language_2/inline_closure_with_constant_arguments_test.dart b/tests/language_2/optimize/inline_closure_with_constant_arguments_test.dart
similarity index 100%
rename from tests/language_2/inline_closure_with_constant_arguments_test.dart
rename to tests/language_2/optimize/inline_closure_with_constant_arguments_test.dart
diff --git a/tests/language_2/inlined_conditional_test.dart b/tests/language_2/optimize/inline_conditional_test.dart
similarity index 100%
rename from tests/language_2/inlined_conditional_test.dart
rename to tests/language_2/optimize/inline_conditional_test.dart
diff --git a/tests/language_2/inline_effect_context_test.dart b/tests/language_2/optimize/inline_effect_context_test.dart
similarity index 100%
rename from tests/language_2/inline_effect_context_test.dart
rename to tests/language_2/optimize/inline_effect_context_test.dart
diff --git a/tests/language_2/inline_getter_test.dart b/tests/language_2/optimize/inline_getter_test.dart
similarity index 100%
rename from tests/language_2/inline_getter_test.dart
rename to tests/language_2/optimize/inline_getter_test.dart
diff --git a/tests/language_2/inline_in_for_initializer_and_bailout_test.dart b/tests/language_2/optimize/inline_in_for_initializer_and_bailout_test.dart
similarity index 100%
rename from tests/language_2/inline_in_for_initializer_and_bailout_test.dart
rename to tests/language_2/optimize/inline_in_for_initializer_and_bailout_test.dart
diff --git a/tests/language_2/inline_super_field_lib.dart b/tests/language_2/optimize/inline_super_field_lib.dart
similarity index 100%
rename from tests/language_2/inline_super_field_lib.dart
rename to tests/language_2/optimize/inline_super_field_lib.dart
diff --git a/tests/language_2/inline_super_field_test.dart b/tests/language_2/optimize/inline_super_field_test.dart
similarity index 100%
rename from tests/language_2/inline_super_field_test.dart
rename to tests/language_2/optimize/inline_super_field_test.dart
diff --git a/tests/language_2/inline_super_part.dart b/tests/language_2/optimize/inline_super_part.dart
similarity index 100%
rename from tests/language_2/inline_super_part.dart
rename to tests/language_2/optimize/inline_super_part.dart
diff --git a/tests/language_2/inline_super_test.dart b/tests/language_2/optimize/inline_super_test.dart
similarity index 100%
rename from tests/language_2/inline_super_test.dart
rename to tests/language_2/optimize/inline_super_test.dart
diff --git a/tests/language_2/inline_test.dart b/tests/language_2/optimize/inline_test.dart
similarity index 100%
rename from tests/language_2/inline_test.dart
rename to tests/language_2/optimize/inline_test.dart
diff --git a/tests/language_2/inline_test_context_test.dart b/tests/language_2/optimize/inline_test_context_test.dart
similarity index 100%
rename from tests/language_2/inline_test_context_test.dart
rename to tests/language_2/optimize/inline_test_context_test.dart
diff --git a/tests/language_2/inlined_throw_test.dart b/tests/language_2/optimize/inline_throw_test.dart
similarity index 100%
rename from tests/language_2/inlined_throw_test.dart
rename to tests/language_2/optimize/inline_throw_test.dart
diff --git a/tests/language_2/inline_value_context_test.dart b/tests/language_2/optimize/inline_value_context_test.dart
similarity index 100%
rename from tests/language_2/inline_value_context_test.dart
rename to tests/language_2/optimize/inline_value_context_test.dart
diff --git a/tests/language_2/optimized_isempty_test.dart b/tests/language_2/optimize/isempty_test.dart
similarity index 100%
rename from tests/language_2/optimized_isempty_test.dart
rename to tests/language_2/optimize/isempty_test.dart
diff --git a/tests/language_2/licm2_test.dart b/tests/language_2/optimize/licm2_test.dart
similarity index 100%
rename from tests/language_2/licm2_test.dart
rename to tests/language_2/optimize/licm2_test.dart
diff --git a/tests/language_2/licm3_test.dart b/tests/language_2/optimize/licm3_test.dart
similarity index 100%
rename from tests/language_2/licm3_test.dart
rename to tests/language_2/optimize/licm3_test.dart
diff --git a/tests/language_2/licm_test.dart b/tests/language_2/optimize/licm_test.dart
similarity index 100%
rename from tests/language_2/licm_test.dart
rename to tests/language_2/optimize/licm_test.dart
diff --git a/tests/language_2/optimized_lists_test.dart b/tests/language_2/optimize/lists_test.dart
similarity index 100%
rename from tests/language_2/optimized_lists_test.dart
rename to tests/language_2/optimize/lists_test.dart
diff --git a/tests/language_2/osr_test.dart b/tests/language_2/optimize/osr_test.dart
similarity index 100%
rename from tests/language_2/osr_test.dart
rename to tests/language_2/optimize/osr_test.dart
diff --git a/tests/language_2/phi_merge_test.dart b/tests/language_2/optimize/phi_merge_test.dart
similarity index 100%
rename from tests/language_2/phi_merge_test.dart
rename to tests/language_2/optimize/phi_merge_test.dart
diff --git a/tests/language_2/pure_function2_test.dart b/tests/language_2/optimize/pure_function2_test.dart
similarity index 100%
rename from tests/language_2/pure_function2_test.dart
rename to tests/language_2/optimize/pure_function2_test.dart
diff --git a/tests/language_2/pure_function_test.dart b/tests/language_2/optimize/pure_function_test.dart
similarity index 100%
rename from tests/language_2/pure_function_test.dart
rename to tests/language_2/optimize/pure_function_test.dart
diff --git a/tests/language_2/optimize_redundant_array_load_test.dart b/tests/language_2/optimize/redundant_array_load_test.dart
similarity index 100%
rename from tests/language_2/optimize_redundant_array_load_test.dart
rename to tests/language_2/optimize/redundant_array_load_test.dart
diff --git a/tests/language_2/optimized_setter_test.dart b/tests/language_2/optimize/setter_test.dart
similarity index 100%
rename from tests/language_2/optimized_setter_test.dart
rename to tests/language_2/optimize/setter_test.dart
diff --git a/tests/language_2/optimized_string_charat_test.dart b/tests/language_2/optimize/string_charat_test.dart
similarity index 100%
rename from tests/language_2/optimized_string_charat_test.dart
rename to tests/language_2/optimize/string_charat_test.dart
diff --git a/tests/language_2/optimized_string_charcodeat_test.dart b/tests/language_2/optimize/string_charcodeat_test.dart
similarity index 100%
rename from tests/language_2/optimized_string_charcodeat_test.dart
rename to tests/language_2/optimize/string_charcodeat_test.dart
diff --git a/tests/language_2/override_const_field_test.dart b/tests/language_2/override/const_field_test.dart
similarity index 100%
rename from tests/language_2/override_const_field_test.dart
rename to tests/language_2/override/const_field_test.dart
diff --git a/tests/language_2/override_field_method1_test.dart b/tests/language_2/override/field_method1_test.dart
similarity index 100%
rename from tests/language_2/override_field_method1_test.dart
rename to tests/language_2/override/field_method1_test.dart
diff --git a/tests/language_2/override_field_method2_test.dart b/tests/language_2/override/field_method2_test.dart
similarity index 100%
rename from tests/language_2/override_field_method2_test.dart
rename to tests/language_2/override/field_method2_test.dart
diff --git a/tests/language_2/override_field_method3_test.dart b/tests/language_2/override/field_method3_test.dart
similarity index 100%
rename from tests/language_2/override_field_method3_test.dart
rename to tests/language_2/override/field_method3_test.dart
diff --git a/tests/language_2/override_field_method4_test.dart b/tests/language_2/override/field_method4_test.dart
similarity index 100%
rename from tests/language_2/override_field_method4_test.dart
rename to tests/language_2/override/field_method4_test.dart
diff --git a/tests/language_2/override_field_test.dart b/tests/language_2/override/field_test.dart
similarity index 100%
rename from tests/language_2/override_field_test.dart
rename to tests/language_2/override/field_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_1_test.dart b/tests/language_2/override/inheritance_abstract_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_1_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_1_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_2_test.dart b/tests/language_2/override/inheritance_abstract_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_2_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_2_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_3_test.dart b/tests/language_2/override/inheritance_abstract_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_3_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_3_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_4_test.dart b/tests/language_2/override/inheritance_abstract_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_4_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_4_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_5_test.dart b/tests/language_2/override/inheritance_abstract_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_5_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_5_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_6_test.dart b/tests/language_2/override/inheritance_abstract_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_6_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_6_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_7_test.dart b/tests/language_2/override/inheritance_abstract_runtime_7_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_7_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_7_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_runtime_test.dart b/tests/language_2/override/inheritance_abstract_runtime_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_runtime_test.dart
rename to tests/language_2/override/inheritance_abstract_runtime_test.dart
diff --git a/tests/language_2/override_inheritance_abstract_test.dart b/tests/language_2/override/inheritance_abstract_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_abstract_test.dart
rename to tests/language_2/override/inheritance_abstract_test.dart
diff --git a/tests/language_2/override_inheritance_field_test.dart b/tests/language_2/override/inheritance_field_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_field_test.dart
rename to tests/language_2/override/inheritance_field_test.dart
diff --git a/tests/language_2/override_inheritance_generic_test.dart b/tests/language_2/override/inheritance_generic_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_generic_test.dart
rename to tests/language_2/override/inheritance_generic_test.dart
diff --git a/tests/language_2/override_inheritance_method2_test.dart b/tests/language_2/override/inheritance_method2_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_method2_test.dart
rename to tests/language_2/override/inheritance_method2_test.dart
diff --git a/tests/language_2/override_inheritance_method_test.dart b/tests/language_2/override/inheritance_method_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_method_test.dart
rename to tests/language_2/override/inheritance_method_test.dart
diff --git a/tests/language_2/override_inheritance_mixed_test.dart b/tests/language_2/override/inheritance_mixed_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_mixed_test.dart
rename to tests/language_2/override/inheritance_mixed_test.dart
diff --git a/tests/language_2/override_inheritance_no_such_method_test.dart b/tests/language_2/override/inheritance_no_such_method_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_no_such_method_test.dart
rename to tests/language_2/override/inheritance_no_such_method_test.dart
diff --git a/tests/language_2/override_inheritance_setter_test.dart b/tests/language_2/override/inheritance_setter_test.dart
similarity index 100%
rename from tests/language_2/override_inheritance_setter_test.dart
rename to tests/language_2/override/inheritance_setter_test.dart
diff --git a/tests/language_2/override_method_with_field_runtime_test.dart b/tests/language_2/override/method_with_field_runtime_test.dart
similarity index 100%
rename from tests/language_2/override_method_with_field_runtime_test.dart
rename to tests/language_2/override/method_with_field_runtime_test.dart
diff --git a/tests/language_2/override_method_with_field_test.dart b/tests/language_2/override/method_with_field_test.dart
similarity index 100%
rename from tests/language_2/override_method_with_field_test.dart
rename to tests/language_2/override/method_with_field_test.dart
diff --git a/tests/language_2/bad_named_parameters2_runtime_test.dart b/tests/language_2/parameter/bad_named2_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_named_parameters2_runtime_test.dart
rename to tests/language_2/parameter/bad_named2_runtime_test.dart
diff --git a/tests/language_2/bad_named_parameters2_test.dart b/tests/language_2/parameter/bad_named2_test.dart
similarity index 100%
rename from tests/language_2/bad_named_parameters2_test.dart
rename to tests/language_2/parameter/bad_named2_test.dart
diff --git a/tests/language_2/bad_named_parameters_test.dart b/tests/language_2/parameter/bad_named_parameters_test.dart
similarity index 100%
rename from tests/language_2/bad_named_parameters_test.dart
rename to tests/language_2/parameter/bad_named_parameters_test.dart
diff --git a/tests/language_2/bad_named_parameters_runtime_test.dart b/tests/language_2/parameter/bad_named_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_named_parameters_runtime_test.dart
rename to tests/language_2/parameter/bad_named_runtime_test.dart
diff --git a/tests/language_2/parameter_default_test.dart b/tests/language_2/parameter/default_test.dart
similarity index 100%
rename from tests/language_2/parameter_default_test.dart
rename to tests/language_2/parameter/default_test.dart
diff --git a/tests/language_2/parameter_initializer1_test.dart b/tests/language_2/parameter/initializer1_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer1_test.dart
rename to tests/language_2/parameter/initializer1_test.dart
diff --git a/tests/language_2/parameter_initializer2_test.dart b/tests/language_2/parameter/initializer2_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer2_test.dart
rename to tests/language_2/parameter/initializer2_test.dart
diff --git a/tests/language_2/parameter_initializer3_test.dart b/tests/language_2/parameter/initializer3_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer3_test.dart
rename to tests/language_2/parameter/initializer3_test.dart
diff --git a/tests/language_2/parameter_initializer4_test.dart b/tests/language_2/parameter/initializer4_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer4_test.dart
rename to tests/language_2/parameter/initializer4_test.dart
diff --git a/tests/language_2/parameter_initializer5_test.dart b/tests/language_2/parameter/initializer5_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer5_test.dart
rename to tests/language_2/parameter/initializer5_test.dart
diff --git a/tests/language_2/parameter_initializer6_test.dart b/tests/language_2/parameter/initializer6_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer6_test.dart
rename to tests/language_2/parameter/initializer6_test.dart
diff --git a/tests/language_2/parameter_initializer7_test.dart b/tests/language_2/parameter/initializer7_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer7_test.dart
rename to tests/language_2/parameter/initializer7_test.dart
diff --git a/tests/language_2/parameter_initializer_test.dart b/tests/language_2/parameter/initializer_test.dart
similarity index 100%
rename from tests/language_2/parameter_initializer_test.dart
rename to tests/language_2/parameter/initializer_test.dart
diff --git a/tests/language_2/parameter_metadata_test.dart b/tests/language_2/parameter/metadata_test.dart
similarity index 100%
rename from tests/language_2/parameter_metadata_test.dart
rename to tests/language_2/parameter/metadata_test.dart
diff --git a/tests/language_2/parameter_name_conflict_test.dart b/tests/language_2/parameter/name_conflict_test.dart
similarity index 100%
rename from tests/language_2/parameter_name_conflict_test.dart
rename to tests/language_2/parameter/name_conflict_test.dart
diff --git a/tests/language_2/named_parameters2_test.dart b/tests/language_2/parameter/named2_test.dart
similarity index 99%
rename from tests/language_2/named_parameters2_test.dart
rename to tests/language_2/parameter/named2_test.dart
index 5d8e09b1010..8465782388a 100644
--- a/tests/language_2/named_parameters2_test.dart
+++ b/tests/language_2/parameter/named2_test.dart
@@ -11,4 +11,4 @@ int test(int a, [int b]) {
 main() {
   // Parameter b passed twice, as positional and named.
   test(10, 25, b: 26); /*@compile-error=unspecified*/
-}
\ No newline at end of file
+}
diff --git a/tests/language_2/named_parameters3_test.dart b/tests/language_2/parameter/named3_test.dart
similarity index 100%
rename from tests/language_2/named_parameters3_test.dart
rename to tests/language_2/parameter/named3_test.dart
diff --git a/tests/language_2/named_parameters4_test.dart b/tests/language_2/parameter/named4_test.dart
similarity index 100%
rename from tests/language_2/named_parameters4_test.dart
rename to tests/language_2/parameter/named4_test.dart
diff --git a/tests/language_2/named_parameters_aggregated_runtime_test.dart b/tests/language_2/parameter/named_aggregated_runtime_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_aggregated_runtime_test.dart
rename to tests/language_2/parameter/named_aggregated_runtime_test.dart
diff --git a/tests/language_2/named_parameters_aggregated_test.dart b/tests/language_2/parameter/named_aggregated_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_aggregated_test.dart
rename to tests/language_2/parameter/named_aggregated_test.dart
diff --git a/tests/language_2/named_parameter_clash_test.dart b/tests/language_2/parameter/named_clash_test.dart
similarity index 100%
rename from tests/language_2/named_parameter_clash_test.dart
rename to tests/language_2/parameter/named_clash_test.dart
diff --git a/tests/language_2/named_parameters_named_count_test.dart b/tests/language_2/parameter/named_count_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_named_count_test.dart
rename to tests/language_2/parameter/named_count_test.dart
diff --git a/tests/language_2/named_parameters_default_eq_runtime_test.dart b/tests/language_2/parameter/named_default_eq_runtime_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_default_eq_runtime_test.dart
rename to tests/language_2/parameter/named_default_eq_runtime_test.dart
diff --git a/tests/language_2/named_parameters_default_eq_test.dart b/tests/language_2/parameter/named_default_eq_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_default_eq_test.dart
rename to tests/language_2/parameter/named_default_eq_test.dart
diff --git a/tests/language_2/named_parameters_test.dart b/tests/language_2/parameter/named_parameters_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_test.dart
rename to tests/language_2/parameter/named_parameters_test.dart
diff --git a/tests/language_2/named_parameters_passing_false_test.dart b/tests/language_2/parameter/named_passing_false_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_passing_false_test.dart
rename to tests/language_2/parameter/named_passing_false_test.dart
diff --git a/tests/language_2/named_parameters_passing_falsy_test.dart b/tests/language_2/parameter/named_passing_falsy_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_passing_falsy_test.dart
rename to tests/language_2/parameter/named_passing_falsy_test.dart
diff --git a/tests/language_2/named_parameters_passing_null_test.dart b/tests/language_2/parameter/named_passing_null_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_passing_null_test.dart
rename to tests/language_2/parameter/named_passing_null_test.dart
diff --git a/tests/language_2/named_parameters_passing_zero_test.dart b/tests/language_2/parameter/named_passing_zero_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_passing_zero_test.dart
rename to tests/language_2/parameter/named_passing_zero_test.dart
diff --git a/tests/language_2/named_parameter_regression_test.dart b/tests/language_2/parameter/named_regression_test.dart
similarity index 100%
rename from tests/language_2/named_parameter_regression_test.dart
rename to tests/language_2/parameter/named_regression_test.dart
diff --git a/tests/language_2/named_parameters_runtime_test.dart b/tests/language_2/parameter/named_runtime_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_runtime_test.dart
rename to tests/language_2/parameter/named_runtime_test.dart
diff --git a/tests/language_2/named_parameters_type_runtime_test.dart b/tests/language_2/parameter/named_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_type_runtime_test.dart
rename to tests/language_2/parameter/named_type_runtime_test.dart
diff --git a/tests/language_2/named_parameters_type_test.dart b/tests/language_2/parameter/named_type_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_type_test.dart
rename to tests/language_2/parameter/named_type_test.dart
diff --git a/tests/language_2/named_parameters_with_conversions_test.dart b/tests/language_2/parameter/named_with_conversions_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_with_conversions_test.dart
rename to tests/language_2/parameter/named_with_conversions_test.dart
diff --git a/tests/language_2/named_parameters_with_dollars_test.dart b/tests/language_2/parameter/named_with_dollars_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_with_dollars_test.dart
rename to tests/language_2/parameter/named_with_dollars_test.dart
diff --git a/tests/language_2/named_parameters_with_object_property_names_test.dart b/tests/language_2/parameter/named_with_object_property_names_test.dart
similarity index 100%
rename from tests/language_2/named_parameters_with_object_property_names_test.dart
rename to tests/language_2/parameter/named_with_object_property_names_test.dart
diff --git a/tests/language_2/optional_named_parameters_runtime_test.dart b/tests/language_2/parameter/optional_named_runtime_test.dart
similarity index 100%
rename from tests/language_2/optional_named_parameters_runtime_test.dart
rename to tests/language_2/parameter/optional_named_runtime_test.dart
diff --git a/tests/language_2/optional_named_parameters_test.dart b/tests/language_2/parameter/optional_named_test.dart
similarity index 100%
rename from tests/language_2/optional_named_parameters_test.dart
rename to tests/language_2/parameter/optional_named_test.dart
diff --git a/tests/language_2/param_test.dart b/tests/language_2/parameter/param_test.dart
similarity index 100%
rename from tests/language_2/param_test.dart
rename to tests/language_2/parameter/param_test.dart
diff --git a/tests/language_2/param1_test.dart b/tests/language_2/parameter/parameter1_test.dart
similarity index 100%
rename from tests/language_2/param1_test.dart
rename to tests/language_2/parameter/parameter1_test.dart
diff --git a/tests/language_2/param2_test.dart b/tests/language_2/parameter/parameter2_test.dart
similarity index 100%
rename from tests/language_2/param2_test.dart
rename to tests/language_2/parameter/parameter2_test.dart
diff --git a/tests/language_2/positional_parameters_type_runtime_test.dart b/tests/language_2/parameter/positional_type_runtime_test.dart
similarity index 100%
rename from tests/language_2/positional_parameters_type_runtime_test.dart
rename to tests/language_2/parameter/positional_type_runtime_test.dart
diff --git a/tests/language_2/positional_parameters_type_test.dart b/tests/language_2/parameter/positional_type_test.dart
similarity index 100%
rename from tests/language_2/positional_parameters_type_test.dart
rename to tests/language_2/parameter/positional_type_test.dart
diff --git a/tests/language_2/parameter_types_specialization_test.dart b/tests/language_2/parameter/types_specialization_test.dart
similarity index 100%
rename from tests/language_2/parameter_types_specialization_test.dart
rename to tests/language_2/parameter/types_specialization_test.dart
diff --git a/tests/language_2/missing_part_of_tag_part.dart b/tests/language_2/part/missing_part_of_tag_part.dart
similarity index 100%
rename from tests/language_2/missing_part_of_tag_part.dart
rename to tests/language_2/part/missing_part_of_tag_part.dart
diff --git a/tests/language_2/missing_part_of_tag_test.dart b/tests/language_2/part/missing_part_of_tag_test.dart
similarity index 100%
rename from tests/language_2/missing_part_of_tag_test.dart
rename to tests/language_2/part/missing_part_of_tag_test.dart
diff --git a/tests/language_2/part_of_multiple_libs_lib.dart b/tests/language_2/part/of_multiple_libs_lib.dart
similarity index 86%
rename from tests/language_2/part_of_multiple_libs_lib.dart
rename to tests/language_2/part/of_multiple_libs_lib.dart
index 7c71bcbcc6b..e1d530658f0 100644
--- a/tests/language_2/part_of_multiple_libs_lib.dart
+++ b/tests/language_2/part/of_multiple_libs_lib.dart
@@ -4,7 +4,7 @@
 
 library ambiguous_lib;
 
-part "part_of_multiple_libs_part.dart";
+part "of_multiple_libs_part.dart";
 
 test() {
   foo();
diff --git a/tests/language_2/part_of_multiple_libs_part.dart b/tests/language_2/part/of_multiple_libs_part.dart
similarity index 100%
rename from tests/language_2/part_of_multiple_libs_part.dart
rename to tests/language_2/part/of_multiple_libs_part.dart
diff --git a/tests/language_2/part_of_multiple_libs_runtime_test.dart b/tests/language_2/part/of_multiple_libs_runtime_test.dart
similarity index 90%
rename from tests/language_2/part_of_multiple_libs_runtime_test.dart
rename to tests/language_2/part/of_multiple_libs_runtime_test.dart
index 15f0e081317..31b3e8d8a74 100644
--- a/tests/language_2/part_of_multiple_libs_runtime_test.dart
+++ b/tests/language_2/part/of_multiple_libs_runtime_test.dart
@@ -9,7 +9,7 @@ library ambiguous_lib;
 
 
 
-part "part_of_multiple_libs_part.dart";
+part "of_multiple_libs_part.dart";
 
 main() {
   foo();
diff --git a/tests/language_2/part_of_multiple_libs_test.dart b/tests/language_2/part/of_multiple_libs_test.dart
similarity index 78%
rename from tests/language_2/part_of_multiple_libs_test.dart
rename to tests/language_2/part/of_multiple_libs_test.dart
index 69bf2c77a52..811617b493f 100644
--- a/tests/language_2/part_of_multiple_libs_test.dart
+++ b/tests/language_2/part/of_multiple_libs_test.dart
@@ -4,9 +4,9 @@
 
 library ambiguous_lib;
 
-import 'part_of_multiple_libs_lib.dart';
+import 'of_multiple_libs_lib.dart';
 
-part "part_of_multiple_libs_part.dart";
+part "of_multiple_libs_part.dart";
 
 //^
 // [cfe] Method not found: 'foo'.
diff --git a/tests/language_2/part_of_uri_part.dart b/tests/language_2/part/of_uri2_part.dart
similarity index 90%
rename from tests/language_2/part_of_uri_part.dart
rename to tests/language_2/part/of_uri2_part.dart
index 55edadf67a4..2893a74e0fe 100644
--- a/tests/language_2/part_of_uri_part.dart
+++ b/tests/language_2/part/of_uri2_part.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of "part_of_uri_test.dart";
+part of "of_uri2_test.dart";
 
 // Refer to declaration in library and other part.
 const bar1 = "part1";
diff --git a/tests/language_2/part_of_uri2_part2.dart b/tests/language_2/part/of_uri2_part2.dart
similarity index 100%
rename from tests/language_2/part_of_uri2_part2.dart
rename to tests/language_2/part/of_uri2_part2.dart
diff --git a/tests/language_2/part_of_uri2_test.dart b/tests/language_2/part/of_uri2_test.dart
similarity index 73%
rename from tests/language_2/part_of_uri2_test.dart
rename to tests/language_2/part/of_uri2_test.dart
index cb59135ffed..ae0a12d086f 100644
--- a/tests/language_2/part_of_uri2_test.dart
+++ b/tests/language_2/part/of_uri2_test.dart
@@ -4,8 +4,8 @@
 
 library part_of_uri2;
 
-part "part_of_uri2_part.dart"; // declares bar1, baz1, uses URI.
-part "part_of_uri2_part2.dart"; // declares bar2, baz2, uses id.
+part "of_uri2_part.dart"; // declares bar1, baz1, uses URI.
+part "of_uri2_part2.dart"; // declares bar2, baz2, uses id.
 
 const foo = 'foo';
 const qux = "$baz1$baz2";
diff --git a/tests/language_2/part_of_uri2_part.dart b/tests/language_2/part/of_uri_part.dart
similarity index 90%
rename from tests/language_2/part_of_uri2_part.dart
rename to tests/language_2/part/of_uri_part.dart
index 22c889a5fd7..65e9fd70b00 100644
--- a/tests/language_2/part_of_uri2_part.dart
+++ b/tests/language_2/part/of_uri_part.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of "part_of_uri2_test.dart";
+part of "of_uri_test.dart";
 
 // Refer to declaration in library and other part.
 const bar1 = "part1";
diff --git a/tests/language_2/part_of_uri_part2.dart b/tests/language_2/part/of_uri_part2.dart
similarity index 90%
rename from tests/language_2/part_of_uri_part2.dart
rename to tests/language_2/part/of_uri_part2.dart
index 5069b531381..9facbf491ca 100644
--- a/tests/language_2/part_of_uri_part2.dart
+++ b/tests/language_2/part/of_uri_part2.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of "part_of_uri_test.dart";
+part of "of_uri_test.dart";
 
 // Refer to declaration in library and other part.
 const bar2 = "part2";
diff --git a/tests/language_2/part_of_uri_test.dart b/tests/language_2/part/of_uri_test.dart
similarity index 77%
rename from tests/language_2/part_of_uri_test.dart
rename to tests/language_2/part/of_uri_test.dart
index 95d5dfd1ab6..acb568d5303 100644
--- a/tests/language_2/part_of_uri_test.dart
+++ b/tests/language_2/part/of_uri_test.dart
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // No library declaration
-part "part_of_uri_part.dart"; // declares bar1, baz1
-part "part_of_uri_part2.dart"; // declares bar2, baz2
+part "of_uri_part.dart"; // declares bar1, baz1
+part "of_uri_part2.dart"; // declares bar2, baz2
 
 const foo = 'foo';
 const qux = "$baz1$baz2";
diff --git a/tests/language_2/part_part.dart b/tests/language_2/part/part.dart
similarity index 100%
rename from tests/language_2/part_part.dart
rename to tests/language_2/part/part.dart
diff --git a/tests/language_2/part2_test.dart b/tests/language_2/part/part2_test.dart
similarity index 85%
rename from tests/language_2/part2_test.dart
rename to tests/language_2/part/part2_test.dart
index 44f67acb311..706bc1f99b5 100644
--- a/tests/language_2/part2_test.dart
+++ b/tests/language_2/part/part2_test.dart
@@ -4,7 +4,7 @@
 
 library org.dartlang.test.part2_test;
 
-part "part_part.dart"; //# 01: compile-time error
+part "part.dart"; //# 01: compile-time error
 
 main() {
   print(foo); //# 01: continued
diff --git a/tests/language_2/part_test.dart b/tests/language_2/part/part_test.dart
similarity index 92%
rename from tests/language_2/part_test.dart
rename to tests/language_2/part/part_test.dart
index 38d84d8e0d5..cc6cd77525a 100644
--- a/tests/language_2/part_test.dart
+++ b/tests/language_2/part/part_test.dart
@@ -4,7 +4,7 @@
 
 library org.dartlang.test.part_test;
 
-part "part_part.dart";
+part "part.dart";
 
 main() {
   print(foo);
diff --git a/tests/language_2/part_refers_to_core_library_runtime_test.dart b/tests/language_2/part/refers_to_core_library_runtime_test.dart
similarity index 100%
rename from tests/language_2/part_refers_to_core_library_runtime_test.dart
rename to tests/language_2/part/refers_to_core_library_runtime_test.dart
diff --git a/tests/language_2/part_refers_to_core_library_test.dart b/tests/language_2/part/refers_to_core_library_test.dart
similarity index 100%
rename from tests/language_2/part_refers_to_core_library_test.dart
rename to tests/language_2/part/refers_to_core_library_test.dart
diff --git a/tests/language_2/part_self_test.dart b/tests/language_2/part/self_test.dart
similarity index 86%
rename from tests/language_2/part_self_test.dart
rename to tests/language_2/part/self_test.dart
index 1f44de8f0b6..cc3e7774a42 100644
--- a/tests/language_2/part_self_test.dart
+++ b/tests/language_2/part/self_test.dart
@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part "part_self_test.dart";
-//   ^^^^^^^^^^^^^^^^^^^^^
+part "self_test.dart";
+//   ^^^^^^^^^^^^^^^^
 // [analyzer] COMPILE_TIME_ERROR.PART_OF_NON_PART
 
 main() {
diff --git a/tests/language_2/prefix_assignment_runtime_test.dart b/tests/language_2/prefix/assignment_runtime_test.dart
similarity index 100%
rename from tests/language_2/prefix_assignment_runtime_test.dart
rename to tests/language_2/prefix/assignment_runtime_test.dart
diff --git a/tests/language_2/prefix_assignment_test.dart b/tests/language_2/prefix/assignment_test.dart
similarity index 100%
rename from tests/language_2/prefix_assignment_test.dart
rename to tests/language_2/prefix/assignment_test.dart
diff --git a/tests/language_2/empty_library.dart b/tests/language_2/prefix/empty_library.dart
similarity index 100%
rename from tests/language_2/empty_library.dart
rename to tests/language_2/prefix/empty_library.dart
diff --git a/tests/language_2/prefix_identifier_reference_test.dart b/tests/language_2/prefix/identifier_reference_test.dart
similarity index 100%
rename from tests/language_2/prefix_identifier_reference_test.dart
rename to tests/language_2/prefix/identifier_reference_test.dart
diff --git a/tests/language_2/prefix_import_collision_runtime_test.dart b/tests/language_2/prefix/import_collision_runtime_test.dart
similarity index 82%
rename from tests/language_2/prefix_import_collision_runtime_test.dart
rename to tests/language_2/prefix/import_collision_runtime_test.dart
index ee14f613daf..e0dc3c08e7e 100644
--- a/tests/language_2/prefix_import_collision_runtime_test.dart
+++ b/tests/language_2/prefix/import_collision_runtime_test.dart
@@ -8,8 +8,8 @@
 // Using the same prefix name while importing two different libraries is
 // not an error but both library1.dart and library2.dart define 'foo' which
 // results in a duplicate definition error.
-import "library1.dart" as lib2; // defines 'foo'.
-import "library2.dart" as lib2; // also defines 'foo'.
+import "../library1.dart" as lib2; // defines 'foo'.
+import "../library2.dart" as lib2; // also defines 'foo'.
 
 main() {
 
diff --git a/tests/language_2/prefix_import_collision_test.dart b/tests/language_2/prefix/import_collision_test.dart
similarity index 82%
rename from tests/language_2/prefix_import_collision_test.dart
rename to tests/language_2/prefix/import_collision_test.dart
index d7bd0f76c8b..6ad50cb13ba 100644
--- a/tests/language_2/prefix_import_collision_test.dart
+++ b/tests/language_2/prefix/import_collision_test.dart
@@ -5,8 +5,8 @@
 // Using the same prefix name while importing two different libraries is
 // not an error but both library1.dart and library2.dart define 'foo' which
 // results in a duplicate definition error.
-import "library1.dart" as lib2; // defines 'foo'.
-import "library2.dart" as lib2; // also defines 'foo'.
+import "../library1.dart" as lib2; // defines 'foo'.
+import "../library2.dart" as lib2; // also defines 'foo'.
 
 main() {
   lib2.foo = 1;
diff --git a/tests/language_2/prefix_invalid_name_runtime_test.dart b/tests/language_2/prefix/invalid_name_runtime_test.dart
similarity index 93%
rename from tests/language_2/prefix_invalid_name_runtime_test.dart
rename to tests/language_2/prefix/invalid_name_runtime_test.dart
index 586b87e978b..a2a71f1c3f6 100644
--- a/tests/language_2/prefix_invalid_name_runtime_test.dart
+++ b/tests/language_2/prefix/invalid_name_runtime_test.dart
@@ -6,7 +6,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // Prefix must be a valid identifier.
-import "library1.dart"
+import "../library1.dart"
 
     ;
 
diff --git a/tests/language_2/prefix_invalid_name_test.dart b/tests/language_2/prefix/invalid_name_test.dart
similarity index 96%
rename from tests/language_2/prefix_invalid_name_test.dart
rename to tests/language_2/prefix/invalid_name_test.dart
index c96b904a9a1..7ee08b17fe3 100644
--- a/tests/language_2/prefix_invalid_name_test.dart
+++ b/tests/language_2/prefix/invalid_name_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // Prefix must be a valid identifier.
-import "library1.dart"
+import "../library1.dart"
     as lib1.invalid
     // ^^^^
     // [analyzer] SYNTACTIC_ERROR.EXPECTED_TOKEN
diff --git a/tests/language_2/prefix_new_test.dart b/tests/language_2/prefix/new_test.dart
similarity index 92%
rename from tests/language_2/prefix_new_test.dart
rename to tests/language_2/prefix/new_test.dart
index 7304a74061d..23c78345306 100644
--- a/tests/language_2/prefix_new_test.dart
+++ b/tests/language_2/prefix/new_test.dart
@@ -5,7 +5,7 @@
 library PrefixTest;
 
 import "package:expect/expect.dart";
-import "prefix_test1.dart";
+import "test1.dart";
 
 main() {
   Expect.equals(Prefix.getSource(), Prefix.getImport() + 1);
diff --git a/tests/language_2/prefix_new_test1.dart b/tests/language_2/prefix/new_test1.dart
similarity index 91%
rename from tests/language_2/prefix_new_test1.dart
rename to tests/language_2/prefix/new_test1.dart
index 81a45a7430d..106de8037e4 100644
--- a/tests/language_2/prefix_new_test1.dart
+++ b/tests/language_2/prefix/new_test1.dart
@@ -4,7 +4,7 @@
 
 library PrefixTest1;
 
-import "prefix_test2.dart" as test2;
+import "test2.dart" as test2;
 
 class Prefix {
   static const int foo = 43;
diff --git a/tests/language_2/prefix_new_test2.dart b/tests/language_2/prefix/new_test2.dart
similarity index 100%
rename from tests/language_2/prefix_new_test2.dart
rename to tests/language_2/prefix/new_test2.dart
diff --git a/tests/language_2/prefix101_test.dart b/tests/language_2/prefix/prefix101_test.dart
similarity index 94%
rename from tests/language_2/prefix101_test.dart
rename to tests/language_2/prefix/prefix101_test.dart
index 206b4275a63..b479e6d7788 100644
--- a/tests/language_2/prefix101_test.dart
+++ b/tests/language_2/prefix/prefix101_test.dart
@@ -8,8 +8,8 @@
 library Prefix101Test.dart;
 
 import "package:expect/expect.dart";
-import "library10.dart" as lib101;
-import "library11.dart" as lib101;
+import "../library10.dart" as lib101;
+import "../library11.dart" as lib101;
 
 class Prefix101Test {
   static Test1() {
diff --git a/tests/language_2/prefix10_test.dart b/tests/language_2/prefix/prefix10_test.dart
similarity index 94%
rename from tests/language_2/prefix10_test.dart
rename to tests/language_2/prefix/prefix10_test.dart
index 4f0f051078c..3e0853cc329 100644
--- a/tests/language_2/prefix10_test.dart
+++ b/tests/language_2/prefix/prefix10_test.dart
@@ -5,8 +5,8 @@
 library Prefix10Test.dart;
 
 import "package:expect/expect.dart";
-import "library10.dart" as lib10;
-import "library11.dart" as lib11;
+import "../library10.dart" as lib10;
+import "../library11.dart" as lib11;
 
 class Prefix10Test {
   static Test1() {
diff --git a/tests/language_2/prefix11_test.dart b/tests/language_2/prefix/prefix11_test.dart
similarity index 95%
rename from tests/language_2/prefix11_test.dart
rename to tests/language_2/prefix/prefix11_test.dart
index c6c164192a1..ec09c332dde 100644
--- a/tests/language_2/prefix11_test.dart
+++ b/tests/language_2/prefix/prefix11_test.dart
@@ -6,8 +6,8 @@
 library Prefix11Test.dart;
 
 import "package:expect/expect.dart";
-import "library10.dart";
-import "library11.dart" as lib11;
+import "../library10.dart";
+import "../library11.dart" as lib11;
 
 class Prefix11Test {
   static Test1() {
diff --git a/tests/language_2/prefix12_test.dart b/tests/language_2/prefix/prefix12_test.dart
similarity index 94%
rename from tests/language_2/prefix12_test.dart
rename to tests/language_2/prefix/prefix12_test.dart
index 1aeae09e822..5ce98bdb956 100644
--- a/tests/language_2/prefix12_test.dart
+++ b/tests/language_2/prefix/prefix12_test.dart
@@ -6,7 +6,7 @@
 library Prefix12Test.dart;
 
 import "package:expect/expect.dart";
-import "library11.dart" as lib11;
+import "../library11.dart" as lib11;
 
 class Prefix12Test {
   static Test1() {
diff --git a/tests/language_2/prefix14_test.dart b/tests/language_2/prefix/prefix14_test.dart
similarity index 98%
rename from tests/language_2/prefix14_test.dart
rename to tests/language_2/prefix/prefix14_test.dart
index 2c92aa00208..f9d5c684ad5 100644
--- a/tests/language_2/prefix14_test.dart
+++ b/tests/language_2/prefix/prefix14_test.dart
@@ -7,7 +7,7 @@
 library Prefix14Test.dart;
 
 import "package:expect/expect.dart";
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 typedef lib12.Library12 myFunc(lib12.Library12 param);
 
diff --git a/tests/language_2/prefix15_test.dart b/tests/language_2/prefix/prefix15_test.dart
similarity index 97%
rename from tests/language_2/prefix15_test.dart
rename to tests/language_2/prefix/prefix15_test.dart
index 51dd32f8fa3..123ae997530 100644
--- a/tests/language_2/prefix15_test.dart
+++ b/tests/language_2/prefix/prefix15_test.dart
@@ -7,7 +7,7 @@
 library Prefix15Test.dart;
 
 import "package:expect/expect.dart";
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 typedef T myFunc<T>(T param);
 
diff --git a/tests/language_2/prefix16_runtime_test.dart b/tests/language_2/prefix/prefix16_runtime_test.dart
similarity index 95%
rename from tests/language_2/prefix16_runtime_test.dart
rename to tests/language_2/prefix/prefix16_runtime_test.dart
index d2e0b91deb5..718777fe386 100644
--- a/tests/language_2/prefix16_runtime_test.dart
+++ b/tests/language_2/prefix/prefix16_runtime_test.dart
@@ -10,7 +10,7 @@
 // lib12.Library13 is not resolved.
 
 import "package:expect/expect.dart";
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 typedef
 
diff --git a/tests/language_2/prefix16_test.dart b/tests/language_2/prefix/prefix16_test.dart
similarity index 97%
rename from tests/language_2/prefix16_test.dart
rename to tests/language_2/prefix/prefix16_test.dart
index 97999c7f3be..874b910bf2f 100644
--- a/tests/language_2/prefix16_test.dart
+++ b/tests/language_2/prefix/prefix16_test.dart
@@ -7,7 +7,7 @@
 // lib12.Library13 is not resolved.
 
 import "package:expect/expect.dart";
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 typedef
     lib12.Library13
diff --git a/tests/language_2/prefix17_test.dart b/tests/language_2/prefix/prefix17_test.dart
similarity index 94%
rename from tests/language_2/prefix17_test.dart
rename to tests/language_2/prefix/prefix17_test.dart
index 500911ddb75..4af6f9649ed 100644
--- a/tests/language_2/prefix17_test.dart
+++ b/tests/language_2/prefix/prefix17_test.dart
@@ -4,7 +4,7 @@
 
 library Prefix17Test.dart;
 
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 class LocalClass {
   static int static_fld;
diff --git a/tests/language_2/prefix21_bad_lib.dart b/tests/language_2/prefix/prefix21_bad_lib.dart
similarity index 100%
rename from tests/language_2/prefix21_bad_lib.dart
rename to tests/language_2/prefix/prefix21_bad_lib.dart
diff --git a/tests/language_2/prefix21_good_lib.dart b/tests/language_2/prefix/prefix21_good_lib.dart
similarity index 100%
rename from tests/language_2/prefix21_good_lib.dart
rename to tests/language_2/prefix/prefix21_good_lib.dart
diff --git a/tests/language_2/prefix21_test.dart b/tests/language_2/prefix/prefix21_test.dart
similarity index 100%
rename from tests/language_2/prefix21_test.dart
rename to tests/language_2/prefix/prefix21_test.dart
diff --git a/tests/language_2/prefix22_runtime_test.dart b/tests/language_2/prefix/prefix22_runtime_test.dart
similarity index 94%
rename from tests/language_2/prefix22_runtime_test.dart
rename to tests/language_2/prefix/prefix22_runtime_test.dart
index 792dcfb3f61..286256af2cd 100644
--- a/tests/language_2/prefix22_runtime_test.dart
+++ b/tests/language_2/prefix/prefix22_runtime_test.dart
@@ -9,7 +9,7 @@
 // This should not prevent execution.
 
 library Prefix21NegativeTest.dart;
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 class myClass {
   myClass(
diff --git a/tests/language_2/prefix22_test.dart b/tests/language_2/prefix/prefix22_test.dart
similarity index 94%
rename from tests/language_2/prefix22_test.dart
rename to tests/language_2/prefix/prefix22_test.dart
index 43c5157acf9..e28423d4c0b 100644
--- a/tests/language_2/prefix22_test.dart
+++ b/tests/language_2/prefix/prefix22_test.dart
@@ -6,7 +6,7 @@
 // This should not prevent execution.
 
 library Prefix21NegativeTest.dart;
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 class myClass {
   myClass(
diff --git a/tests/language_2/prefix23_runtime_test.dart b/tests/language_2/prefix/prefix23_runtime_test.dart
similarity index 93%
rename from tests/language_2/prefix23_runtime_test.dart
rename to tests/language_2/prefix/prefix23_runtime_test.dart
index 7c438dcb14f..6ab1736b594 100644
--- a/tests/language_2/prefix23_runtime_test.dart
+++ b/tests/language_2/prefix/prefix23_runtime_test.dart
@@ -10,7 +10,7 @@
 
 library Prefix23Test.dart;
 
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 class myClass {
   final
diff --git a/tests/language_2/prefix23_test.dart b/tests/language_2/prefix/prefix23_test.dart
similarity index 94%
rename from tests/language_2/prefix23_test.dart
rename to tests/language_2/prefix/prefix23_test.dart
index 03bc8422cf9..ef85f1f7bab 100644
--- a/tests/language_2/prefix23_test.dart
+++ b/tests/language_2/prefix/prefix23_test.dart
@@ -7,7 +7,7 @@
 
 library Prefix23Test.dart;
 
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 class myClass {
   final
diff --git a/tests/language_2/prefix24_lib1.dart b/tests/language_2/prefix/prefix24_lib1.dart
similarity index 100%
rename from tests/language_2/prefix24_lib1.dart
rename to tests/language_2/prefix/prefix24_lib1.dart
diff --git a/tests/language_2/prefix24_lib2.dart b/tests/language_2/prefix/prefix24_lib2.dart
similarity index 100%
rename from tests/language_2/prefix24_lib2.dart
rename to tests/language_2/prefix/prefix24_lib2.dart
diff --git a/tests/language_2/prefix24_lib3.dart b/tests/language_2/prefix/prefix24_lib3.dart
similarity index 100%
rename from tests/language_2/prefix24_lib3.dart
rename to tests/language_2/prefix/prefix24_lib3.dart
diff --git a/tests/language_2/prefix24_test.dart b/tests/language_2/prefix/prefix24_test.dart
similarity index 100%
rename from tests/language_2/prefix24_test.dart
rename to tests/language_2/prefix/prefix24_test.dart
diff --git a/tests/language_2/prefix_test.dart b/tests/language_2/prefix/prefix_test.dart
similarity index 93%
rename from tests/language_2/prefix_test.dart
rename to tests/language_2/prefix/prefix_test.dart
index dc71367065d..bcecae73b8f 100644
--- a/tests/language_2/prefix_test.dart
+++ b/tests/language_2/prefix/prefix_test.dart
@@ -5,7 +5,7 @@
 library PrefixTest.dart;
 
 import "package:expect/expect.dart";
-import "prefix_test1.dart";
+import "test1.dart";
 
 class PrefixTest {
   static testMain() {
diff --git a/tests/language_2/prefix_shadow_runtime_test.dart b/tests/language_2/prefix/shadow_runtime_test.dart
similarity index 91%
rename from tests/language_2/prefix_shadow_runtime_test.dart
rename to tests/language_2/prefix/shadow_runtime_test.dart
index 8ee27f04712..dc83ce3251d 100644
--- a/tests/language_2/prefix_shadow_runtime_test.dart
+++ b/tests/language_2/prefix/shadow_runtime_test.dart
@@ -8,8 +8,8 @@
 // Type parameters can shadow a library prefix.
 
 import "package:expect/expect.dart";
-import "library10.dart" as T;
-import "library10.dart" as lib10;
+import "../library10.dart" as T;
+import "../library10.dart" as lib10;
 
 class P<T> {
   test() {
diff --git a/tests/language_2/prefix_shadow_test.dart b/tests/language_2/prefix/shadow_test.dart
similarity index 92%
rename from tests/language_2/prefix_shadow_test.dart
rename to tests/language_2/prefix/shadow_test.dart
index ca337553844..4a5bdc218c5 100644
--- a/tests/language_2/prefix_shadow_test.dart
+++ b/tests/language_2/prefix/shadow_test.dart
@@ -5,8 +5,8 @@
 // Type parameters can shadow a library prefix.
 
 import "package:expect/expect.dart";
-import "library10.dart" as T;
-import "library10.dart" as lib10;
+import "../library10.dart" as T;
+import "../library10.dart" as lib10;
 
 class P<T> {
   test() {
diff --git a/tests/language_2/prefix_test1.dart b/tests/language_2/prefix/test1.dart
similarity index 91%
rename from tests/language_2/prefix_test1.dart
rename to tests/language_2/prefix/test1.dart
index 103026678c7..a9c546c6ed6 100644
--- a/tests/language_2/prefix_test1.dart
+++ b/tests/language_2/prefix/test1.dart
@@ -4,7 +4,7 @@
 
 library PrefixTest1.dart;
 
-import "prefix_test2.dart" as prefix;
+import "test2.dart" as prefix;
 
 class Prefix {
   static const int foo = 43;
diff --git a/tests/language_2/prefix_test2.dart b/tests/language_2/prefix/test2.dart
similarity index 100%
rename from tests/language_2/prefix_test2.dart
rename to tests/language_2/prefix/test2.dart
diff --git a/tests/language_2/prefix_transitive_import_prefix_runtime_test.dart b/tests/language_2/prefix/transitive_import_prefix_runtime_test.dart
similarity index 93%
rename from tests/language_2/prefix_transitive_import_prefix_runtime_test.dart
rename to tests/language_2/prefix/transitive_import_prefix_runtime_test.dart
index d441887df95..7b016cc6381 100644
--- a/tests/language_2/prefix_transitive_import_prefix_runtime_test.dart
+++ b/tests/language_2/prefix/transitive_import_prefix_runtime_test.dart
@@ -4,7 +4,7 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-import "library10.dart";
+import "../library10.dart";
 
 main() {
   // Library prefixes in the imported libraries should not be visible here.
diff --git a/tests/language_2/prefix_transitive_import_prefix_test.dart b/tests/language_2/prefix/transitive_import_prefix_test.dart
similarity index 96%
rename from tests/language_2/prefix_transitive_import_prefix_test.dart
rename to tests/language_2/prefix/transitive_import_prefix_test.dart
index 778de16303d..514624014ab 100644
--- a/tests/language_2/prefix_transitive_import_prefix_test.dart
+++ b/tests/language_2/prefix/transitive_import_prefix_test.dart
@@ -1,7 +1,7 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-import "library10.dart";
+import "../library10.dart";
 
 main() {
   // Library prefixes in the imported libraries should not be visible here.
diff --git a/tests/language_2/prefix_transitive_import_runtime_test.dart b/tests/language_2/prefix/transitive_import_runtime_test.dart
similarity index 93%
rename from tests/language_2/prefix_transitive_import_runtime_test.dart
rename to tests/language_2/prefix/transitive_import_runtime_test.dart
index 6b92926f916..6c130f676fe 100644
--- a/tests/language_2/prefix_transitive_import_runtime_test.dart
+++ b/tests/language_2/prefix/transitive_import_runtime_test.dart
@@ -7,7 +7,7 @@
 
 // Symbols in libraries imported by the prefixed library should not be visible.
 
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 main() {
   // Class should not be visible.
diff --git a/tests/language_2/prefix_transitive_import_test.dart b/tests/language_2/prefix/transitive_import_test.dart
similarity index 94%
rename from tests/language_2/prefix_transitive_import_test.dart
rename to tests/language_2/prefix/transitive_import_test.dart
index ec248e7e845..0ae3fa75086 100644
--- a/tests/language_2/prefix_transitive_import_test.dart
+++ b/tests/language_2/prefix/transitive_import_test.dart
@@ -4,7 +4,7 @@
 
 // Symbols in libraries imported by the prefixed library should not be visible.
 
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 main() {
   // Class should not be visible.
diff --git a/tests/language_2/prefix_unqualified_invocation_runtime_test.dart b/tests/language_2/prefix/unqualified_invocation_runtime_test.dart
similarity index 100%
rename from tests/language_2/prefix_unqualified_invocation_runtime_test.dart
rename to tests/language_2/prefix/unqualified_invocation_runtime_test.dart
diff --git a/tests/language_2/prefix_unqualified_invocation_test.dart b/tests/language_2/prefix/unqualified_invocation_test.dart
similarity index 100%
rename from tests/language_2/prefix_unqualified_invocation_test.dart
rename to tests/language_2/prefix/unqualified_invocation_test.dart
diff --git a/tests/language_2/prefix_unresolved_class_runtime_test.dart b/tests/language_2/prefix/unresolved_class_runtime_test.dart
similarity index 92%
rename from tests/language_2/prefix_unresolved_class_runtime_test.dart
rename to tests/language_2/prefix/unresolved_class_runtime_test.dart
index 055baa59ec0..17442cc4ca9 100644
--- a/tests/language_2/prefix_unresolved_class_runtime_test.dart
+++ b/tests/language_2/prefix/unresolved_class_runtime_test.dart
@@ -6,7 +6,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // Unresolved symbols should be reported as an error.
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 class Subclass
 
diff --git a/tests/language_2/prefix_unresolved_class_test.dart b/tests/language_2/prefix/unresolved_class_test.dart
similarity index 95%
rename from tests/language_2/prefix_unresolved_class_test.dart
rename to tests/language_2/prefix/unresolved_class_test.dart
index bd32c350b17..901063cef41 100644
--- a/tests/language_2/prefix_unresolved_class_test.dart
+++ b/tests/language_2/prefix/unresolved_class_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 // Unresolved symbols should be reported as an error.
-import "library12.dart" as lib12;
+import "../library12.dart" as lib12;
 
 class Subclass
     extends lib12.Library13
diff --git a/tests/language_2/prefix_variable_collision_runtime_test.dart b/tests/language_2/prefix/variable_collision_runtime_test.dart
similarity index 91%
rename from tests/language_2/prefix_variable_collision_runtime_test.dart
rename to tests/language_2/prefix/variable_collision_runtime_test.dart
index c0f7af3aaa7..87082c0cdc8 100644
--- a/tests/language_2/prefix_variable_collision_runtime_test.dart
+++ b/tests/language_2/prefix/variable_collision_runtime_test.dart
@@ -4,7 +4,7 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-import "library10.dart" as lib10;
+import "../library10.dart" as lib10;
 
 // Top level variables cannot shadow library prefixes, they should collide.
 
diff --git a/tests/language_2/prefix_variable_collision_test.dart b/tests/language_2/prefix/variable_collision_test.dart
similarity index 92%
rename from tests/language_2/prefix_variable_collision_test.dart
rename to tests/language_2/prefix/variable_collision_test.dart
index d4d2540fd18..64dfa3c9bc0 100644
--- a/tests/language_2/prefix_variable_collision_test.dart
+++ b/tests/language_2/prefix/variable_collision_test.dart
@@ -1,7 +1,7 @@
 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-import "library10.dart" as lib10;
+import "../library10.dart" as lib10;
 //                         ^
 // [cfe] 'lib10' is already declared in this scope.
 
diff --git a/tests/language_2/private_access_lib.dart b/tests/language_2/private/access_lib.dart
similarity index 100%
rename from tests/language_2/private_access_lib.dart
rename to tests/language_2/private/access_lib.dart
diff --git a/tests/language_2/private_access_runtime_test.dart b/tests/language_2/private/access_runtime_test.dart
similarity index 82%
rename from tests/language_2/private_access_runtime_test.dart
rename to tests/language_2/private/access_runtime_test.dart
index ae7298353e6..f314be74d91 100644
--- a/tests/language_2/private_access_runtime_test.dart
+++ b/tests/language_2/private/access_runtime_test.dart
@@ -7,8 +7,8 @@
 
 import 'package:expect/expect.dart';
 
-import 'private_access_lib.dart';
-import 'private_access_lib.dart' as private;
+import 'access_lib.dart';
+import 'access_lib.dart' as private;
 
 main() {
 
diff --git a/tests/language_2/private_access_test.dart b/tests/language_2/private/access_test.dart
similarity index 93%
rename from tests/language_2/private_access_test.dart
rename to tests/language_2/private/access_test.dart
index e13267eafb4..28516598302 100644
--- a/tests/language_2/private_access_test.dart
+++ b/tests/language_2/private/access_test.dart
@@ -4,8 +4,8 @@
 
 import 'package:expect/expect.dart';
 
-import 'private_access_lib.dart';
-import 'private_access_lib.dart' as private;
+import 'access_lib.dart';
+import 'access_lib.dart' as private;
 
 main() {
   _function();
diff --git a/tests/language_2/private_clash_lib.dart b/tests/language_2/private/clash_lib.dart
similarity index 100%
rename from tests/language_2/private_clash_lib.dart
rename to tests/language_2/private/clash_lib.dart
diff --git a/tests/language_2/private_clash_test.dart b/tests/language_2/private/clash_test.dart
similarity index 92%
rename from tests/language_2/private_clash_test.dart
rename to tests/language_2/private/clash_test.dart
index db70f819b6b..dffbc265079 100644
--- a/tests/language_2/private_clash_test.dart
+++ b/tests/language_2/private/clash_test.dart
@@ -4,7 +4,7 @@
 
 library a;
 
-import 'private_clash_lib.dart' as lib;
+import 'clash_lib.dart' as lib;
 import 'package:expect/expect.dart';
 
 class A extends lib.B {
diff --git a/tests/language_2/private_lib.dart b/tests/language_2/private/lib.dart
similarity index 100%
rename from tests/language_2/private_lib.dart
rename to tests/language_2/private/lib.dart
diff --git a/tests/language_2/private_main.dart b/tests/language_2/private/main.dart
similarity index 100%
rename from tests/language_2/private_main.dart
rename to tests/language_2/private/main.dart
diff --git a/tests/language_2/private_member1_lib.dart b/tests/language_2/private/member1_lib.dart
similarity index 87%
rename from tests/language_2/private_member1_lib.dart
rename to tests/language_2/private/member1_lib.dart
index fb6fdb21d96..62b00c50320 100644
--- a/tests/language_2/private_member1_lib.dart
+++ b/tests/language_2/private/member1_lib.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'private_member1_test.dart';
+import 'member1_test.dart';
 
 class B extends A {
   bool _instanceField;
diff --git a/tests/language_2/private_member1_test.dart b/tests/language_2/private/member1_test.dart
similarity index 93%
rename from tests/language_2/private_member1_test.dart
rename to tests/language_2/private/member1_test.dart
index 4a8ecb96437..a542e4831b2 100644
--- a/tests/language_2/private_member1_test.dart
+++ b/tests/language_2/private/member1_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'private_member1_lib.dart';
+import 'member1_lib.dart';
 
 class A {}
 
diff --git a/tests/language_2/private_member2_lib.dart b/tests/language_2/private/member2_lib.dart
similarity index 88%
rename from tests/language_2/private_member2_lib.dart
rename to tests/language_2/private/member2_lib.dart
index 0b2590c393f..cba58117ee4 100644
--- a/tests/language_2/private_member2_lib.dart
+++ b/tests/language_2/private/member2_lib.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'private_member2_test.dart';
+import 'member2_test.dart';
 
 class B extends A {
   static bool _staticField;
diff --git a/tests/language_2/private_member2_test.dart b/tests/language_2/private/member2_test.dart
similarity index 93%
rename from tests/language_2/private_member2_test.dart
rename to tests/language_2/private/member2_test.dart
index 15e374751c7..7c86d12c5cb 100644
--- a/tests/language_2/private_member2_test.dart
+++ b/tests/language_2/private/member2_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'private_member2_lib.dart';
+import 'member2_lib.dart';
 
 class A {}
 
diff --git a/tests/language_2/private_member3_lib.dart b/tests/language_2/private/member3_lib.dart
similarity index 88%
rename from tests/language_2/private_member3_lib.dart
rename to tests/language_2/private/member3_lib.dart
index 00309f9fdf9..c51338aeb16 100644
--- a/tests/language_2/private_member3_lib.dart
+++ b/tests/language_2/private/member3_lib.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'private_member3_test.dart';
+import 'member3_test.dart';
 
 class B extends A {
   bool _fun() {
diff --git a/tests/language_2/private_member3_test.dart b/tests/language_2/private/member3_test.dart
similarity index 92%
rename from tests/language_2/private_member3_test.dart
rename to tests/language_2/private/member3_test.dart
index 4e7675fb224..eba3211c42e 100644
--- a/tests/language_2/private_member3_test.dart
+++ b/tests/language_2/private/member3_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'private_member3_lib.dart';
+import 'member3_lib.dart';
 
 class A {}
 
diff --git a/tests/language_2/private_member_lib_b.dart b/tests/language_2/private/member_lib_b.dart
similarity index 91%
rename from tests/language_2/private_member_lib_b.dart
rename to tests/language_2/private/member_lib_b.dart
index 7eb97b67603..dfc3931e8ed 100644
--- a/tests/language_2/private_member_lib_b.dart
+++ b/tests/language_2/private/member_lib_b.dart
@@ -4,7 +4,7 @@
 
 library PrivateMemberLibB;
 
-import 'private_member_test.dart';
+import 'member_test.dart';
 
 class B extends A {
   bool _instanceField;
diff --git a/tests/language_2/private_member_test.dart b/tests/language_2/private/member_test.dart
similarity index 93%
rename from tests/language_2/private_member_test.dart
rename to tests/language_2/private/member_test.dart
index aeec7afcb2d..5c8c3ec6541 100644
--- a/tests/language_2/private_member_test.dart
+++ b/tests/language_2/private/member_test.dart
@@ -4,7 +4,7 @@
 
 library PrivateMemberLibA;
 
-import 'private_member_lib_b.dart';
+import 'member_lib_b.dart';
 
 class A {
   int i;
diff --git a/tests/language_2/private_method_tearoff_lib.dart b/tests/language_2/private/method_tearoff_lib.dart
similarity index 100%
rename from tests/language_2/private_method_tearoff_lib.dart
rename to tests/language_2/private/method_tearoff_lib.dart
diff --git a/tests/language_2/private_method_tearoff_test.dart b/tests/language_2/private/method_tearoff_test.dart
similarity index 93%
rename from tests/language_2/private_method_tearoff_test.dart
rename to tests/language_2/private/method_tearoff_test.dart
index d75580baba7..84f6bd78a0b 100644
--- a/tests/language_2/private_method_tearoff_test.dart
+++ b/tests/language_2/private/method_tearoff_test.dart
@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 
-import './private_method_tearoff_lib.dart';
+import 'method_tearoff_lib.dart';
 
 // `Bar' contains a private method `_f'. The function `baz' is declared in the
 // same library as `Bar'. Given an subtype of `Bar', it tearoffs `_f' and
diff --git a/tests/language_2/private_mixin2_test.dart b/tests/language_2/private/mixin2_test.dart
similarity index 94%
rename from tests/language_2/private_mixin2_test.dart
rename to tests/language_2/private/mixin2_test.dart
index c541edadd7d..848f8389195 100644
--- a/tests/language_2/private_mixin2_test.dart
+++ b/tests/language_2/private/mixin2_test.dart
@@ -7,7 +7,7 @@
 library private_mixin2;
 
 import 'package:expect/expect.dart';
-import 'private_other_mixin2.dart';
+import 'other_mixin2.dart';
 
 void main() {
   var c1;
diff --git a/tests/language_2/private_mixin_exception_throw_test.dart b/tests/language_2/private/mixin_exception_throw_test.dart
similarity index 100%
rename from tests/language_2/private_mixin_exception_throw_test.dart
rename to tests/language_2/private/mixin_exception_throw_test.dart
diff --git a/tests/language_2/private_other.dart b/tests/language_2/private/other.dart
similarity index 100%
rename from tests/language_2/private_other.dart
rename to tests/language_2/private/other.dart
diff --git a/tests/language_2/private_other_lib.dart b/tests/language_2/private/other_lib.dart
similarity index 100%
rename from tests/language_2/private_other_lib.dart
rename to tests/language_2/private/other_lib.dart
diff --git a/tests/language_2/other_library.dart b/tests/language_2/private/other_library.dart
similarity index 100%
rename from tests/language_2/other_library.dart
rename to tests/language_2/private/other_library.dart
diff --git a/tests/language_2/private_other_mixin2.dart b/tests/language_2/private/other_mixin2.dart
similarity index 100%
rename from tests/language_2/private_other_mixin2.dart
rename to tests/language_2/private/other_mixin2.dart
diff --git a/tests/language_2/private1.dart b/tests/language_2/private/private1.dart
similarity index 100%
rename from tests/language_2/private1.dart
rename to tests/language_2/private/private1.dart
diff --git a/tests/language_2/private2.dart b/tests/language_2/private/private2.dart
similarity index 100%
rename from tests/language_2/private2.dart
rename to tests/language_2/private/private2.dart
diff --git a/tests/language_2/private2_lib.dart b/tests/language_2/private/private2_lib.dart
similarity index 100%
rename from tests/language_2/private2_lib.dart
rename to tests/language_2/private/private2_lib.dart
diff --git a/tests/language_2/private2_main.dart b/tests/language_2/private/private2_main.dart
similarity index 100%
rename from tests/language_2/private2_main.dart
rename to tests/language_2/private/private2_main.dart
diff --git a/tests/language_2/private2_test.dart b/tests/language_2/private/private2_test.dart
similarity index 100%
rename from tests/language_2/private2_test.dart
rename to tests/language_2/private/private2_test.dart
diff --git a/tests/language_2/private3_test.dart b/tests/language_2/private/private3_test.dart
similarity index 80%
rename from tests/language_2/private3_test.dart
rename to tests/language_2/private/private3_test.dart
index 96588c94a14..d0e0c78058b 100644
--- a/tests/language_2/private3_test.dart
+++ b/tests/language_2/private/private3_test.dart
@@ -6,7 +6,7 @@
 library Private3Test.dart;
 
 import "package:expect/expect.dart";
-import "private_lib.dart";
+import "lib.dart";
 
-part "private_main.dart";
-part "private_other.dart";
+part "main.dart";
+part "other.dart";
diff --git a/tests/language_2/private4_test.dart b/tests/language_2/private/private4_test.dart
similarity index 100%
rename from tests/language_2/private4_test.dart
rename to tests/language_2/private/private4_test.dart
diff --git a/tests/language_2/private_test.dart b/tests/language_2/private/private_test.dart
similarity index 91%
rename from tests/language_2/private_test.dart
rename to tests/language_2/private/private_test.dart
index c5b80ddd3b9..e6ff096093a 100644
--- a/tests/language_2/private_test.dart
+++ b/tests/language_2/private/private_test.dart
@@ -7,6 +7,6 @@
 library PrivateTest.dart;
 
 import "package:expect/expect.dart";
-import "private_other_lib.dart";
+import "other_lib.dart";
 part "private1.dart";
 part "private2.dart";
diff --git a/tests/language_2/private_selector_lib.dart b/tests/language_2/private/selector_lib.dart
similarity index 90%
rename from tests/language_2/private_selector_lib.dart
rename to tests/language_2/private/selector_lib.dart
index c9a11c9b34a..0ca9560a0f3 100644
--- a/tests/language_2/private_selector_lib.dart
+++ b/tests/language_2/private/selector_lib.dart
@@ -4,7 +4,7 @@
 
 library private_selector_lib;
 
-import 'private_selector_test.dart';
+import 'selector_test.dart';
 
 bool executed = false;
 
diff --git a/tests/language_2/private_selector_test.dart b/tests/language_2/private/selector_test.dart
similarity index 91%
rename from tests/language_2/private_selector_test.dart
rename to tests/language_2/private/selector_test.dart
index 959cb2ec99f..8855f23410c 100644
--- a/tests/language_2/private_selector_test.dart
+++ b/tests/language_2/private/selector_test.dart
@@ -5,7 +5,7 @@
 library private_selector_test;
 
 import "package:expect/expect.dart";
-import 'private_selector_lib.dart';
+import 'selector_lib.dart';
 
 class B extends A {}
 
diff --git a/tests/language_2/private_super_constructor_lib.dart b/tests/language_2/private/super_constructor_lib.dart
similarity index 100%
rename from tests/language_2/private_super_constructor_lib.dart
rename to tests/language_2/private/super_constructor_lib.dart
diff --git a/tests/language_2/private_super_constructor_runtime_test.dart b/tests/language_2/private/super_constructor_runtime_test.dart
similarity index 90%
rename from tests/language_2/private_super_constructor_runtime_test.dart
rename to tests/language_2/private/super_constructor_runtime_test.dart
index e906b7a2a82..3b82c7d9c91 100644
--- a/tests/language_2/private_super_constructor_runtime_test.dart
+++ b/tests/language_2/private/super_constructor_runtime_test.dart
@@ -7,7 +7,7 @@
 
 library private_super_constructor_test;
 
-import 'private_super_constructor_lib.dart';
+import 'super_constructor_lib.dart';
 
 class C extends B {
 
diff --git a/tests/language_2/private_super_constructor_test.dart b/tests/language_2/private/super_constructor_test.dart
similarity index 91%
rename from tests/language_2/private_super_constructor_test.dart
rename to tests/language_2/private/super_constructor_test.dart
index fb5edd18f61..03ad4f3c89c 100644
--- a/tests/language_2/private_super_constructor_test.dart
+++ b/tests/language_2/private/super_constructor_test.dart
@@ -4,7 +4,7 @@
 
 library private_super_constructor_test;
 
-import 'private_super_constructor_lib.dart';
+import 'super_constructor_lib.dart';
 
 class C extends B {
   C() : super._foo();
diff --git a/tests/language_2/propagated_argument_type_check_test.dart b/tests/language_2/propagate/argument_type_check_test.dart
similarity index 100%
rename from tests/language_2/propagated_argument_type_check_test.dart
rename to tests/language_2/propagate/argument_type_check_test.dart
diff --git a/tests/language_2/type_propagation_assert_assignable_test.dart b/tests/language_2/propagate/assert_assignable_test.dart
similarity index 100%
rename from tests/language_2/type_propagation_assert_assignable_test.dart
rename to tests/language_2/propagate/assert_assignable_test.dart
diff --git a/tests/language_2/type_propagation_in_for_update_test.dart b/tests/language_2/propagate/in_for_update_test.dart
similarity index 100%
rename from tests/language_2/type_propagation_in_for_update_test.dart
rename to tests/language_2/propagate/in_for_update_test.dart
diff --git a/tests/language_2/propagate_past_constant_test.dart b/tests/language_2/propagate/past_constant_test.dart
similarity index 100%
rename from tests/language_2/propagate_past_constant_test.dart
rename to tests/language_2/propagate/past_constant_test.dart
diff --git a/tests/language_2/type_propagation_phi_test.dart b/tests/language_2/propagate/phi_test.dart
similarity index 100%
rename from tests/language_2/type_propagation_phi_test.dart
rename to tests/language_2/propagate/phi_test.dart
diff --git a/tests/language_2/type_propagation2_test.dart b/tests/language_2/propagate/propagate2_test.dart
similarity index 100%
rename from tests/language_2/type_propagation2_test.dart
rename to tests/language_2/propagate/propagate2_test.dart
diff --git a/tests/language_2/type_propagation3_test.dart b/tests/language_2/propagate/propagate3_test.dart
similarity index 100%
rename from tests/language_2/type_propagation3_test.dart
rename to tests/language_2/propagate/propagate3_test.dart
diff --git a/tests/language_2/type_propagation_test.dart b/tests/language_2/propagate/type_propagation_test.dart
similarity index 100%
rename from tests/language_2/type_propagation_test.dart
rename to tests/language_2/propagate/type_propagation_test.dart
diff --git a/tests/language_2/redirecting_constructor_initializer_test.dart b/tests/language_2/redirecting/constructor_initializer_test.dart
similarity index 100%
rename from tests/language_2/redirecting_constructor_initializer_test.dart
rename to tests/language_2/redirecting/constructor_initializer_test.dart
diff --git a/tests/language_2/redirecting_factory_bounds_test.dart b/tests/language_2/redirecting/factory_bounds_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_bounds_test.dart
rename to tests/language_2/redirecting/factory_bounds_test.dart
diff --git a/tests/language_2/redirecting_factory_default_values_runtime_test.dart b/tests/language_2/redirecting/factory_default_values_runtime_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_default_values_runtime_test.dart
rename to tests/language_2/redirecting/factory_default_values_runtime_test.dart
diff --git a/tests/language_2/redirecting_factory_default_values_test.dart b/tests/language_2/redirecting/factory_default_values_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_default_values_test.dart
rename to tests/language_2/redirecting/factory_default_values_test.dart
diff --git a/tests/language_2/redirecting_factory_incompatible_signature_runtime_test.dart b/tests/language_2/redirecting/factory_incompatible_signature_runtime_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_incompatible_signature_runtime_test.dart
rename to tests/language_2/redirecting/factory_incompatible_signature_runtime_test.dart
diff --git a/tests/language_2/redirecting_factory_incompatible_signature_test.dart b/tests/language_2/redirecting/factory_incompatible_signature_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_incompatible_signature_test.dart
rename to tests/language_2/redirecting/factory_incompatible_signature_test.dart
diff --git a/tests/language_2/redirecting_factory_infinite_steps_test.dart b/tests/language_2/redirecting/factory_infinite_steps_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_infinite_steps_test.dart
rename to tests/language_2/redirecting/factory_infinite_steps_test.dart
diff --git a/tests/language_2/redirecting_factory_long_test.dart b/tests/language_2/redirecting/factory_long_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_long_test.dart
rename to tests/language_2/redirecting/factory_long_test.dart
diff --git a/tests/language_2/redirecting_factory_malbounded_runtime_test.dart b/tests/language_2/redirecting/factory_malbounded_runtime_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_malbounded_runtime_test.dart
rename to tests/language_2/redirecting/factory_malbounded_runtime_test.dart
diff --git a/tests/language_2/redirecting_factory_malbounded_test.dart b/tests/language_2/redirecting/factory_malbounded_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_malbounded_test.dart
rename to tests/language_2/redirecting/factory_malbounded_test.dart
diff --git a/tests/language_2/redirecting_factory_upcast_test.dart b/tests/language_2/redirecting/factory_upcast_test.dart
similarity index 100%
rename from tests/language_2/redirecting_factory_upcast_test.dart
rename to tests/language_2/redirecting/factory_upcast_test.dart
diff --git a/tests/language_2/reg_exp2_test.dart b/tests/language_2/reg_exp/reg_exp2_test.dart
similarity index 100%
rename from tests/language_2/reg_exp2_test.dart
rename to tests/language_2/reg_exp/reg_exp2_test.dart
diff --git a/tests/language_2/reg_exp3_test.dart b/tests/language_2/reg_exp/reg_exp3_test.dart
similarity index 100%
rename from tests/language_2/reg_exp3_test.dart
rename to tests/language_2/reg_exp/reg_exp3_test.dart
diff --git a/tests/language_2/reg_ex2_test.dart b/tests/language_2/reg_exp/reg_exp4_test.dart
similarity index 100%
rename from tests/language_2/reg_ex2_test.dart
rename to tests/language_2/reg_exp/reg_exp4_test.dart
diff --git a/tests/language_2/reg_exp_test.dart b/tests/language_2/reg_exp/reg_exp_test.dart
similarity index 100%
rename from tests/language_2/reg_exp_test.dart
rename to tests/language_2/reg_exp/reg_exp_test.dart
diff --git a/tests/language_2/regress_r24720_test.dart b/tests/language_2/regress/r24720_test.dart
similarity index 100%
rename from tests/language_2/regress_r24720_test.dart
rename to tests/language_2/regress/r24720_test.dart
diff --git a/tests/language_2/issue10204_test.dart b/tests/language_2/regress/regress10204_test.dart
similarity index 100%
rename from tests/language_2/issue10204_test.dart
rename to tests/language_2/regress/regress10204_test.dart
diff --git a/tests/language_2/issue10321_test.dart b/tests/language_2/regress/regress10321_test.dart
similarity index 100%
rename from tests/language_2/issue10321_test.dart
rename to tests/language_2/regress/regress10321_test.dart
diff --git a/tests/language_2/issue10561_test.dart b/tests/language_2/regress/regress10561_test.dart
similarity index 100%
rename from tests/language_2/issue10561_test.dart
rename to tests/language_2/regress/regress10561_test.dart
diff --git a/tests/language_2/issue10581_test.dart b/tests/language_2/regress/regress10581_test.dart
similarity index 100%
rename from tests/language_2/issue10581_test.dart
rename to tests/language_2/regress/regress10581_test.dart
diff --git a/tests/language_2/issue10721_test.dart b/tests/language_2/regress/regress10721_test.dart
similarity index 100%
rename from tests/language_2/issue10721_test.dart
rename to tests/language_2/regress/regress10721_test.dart
diff --git a/tests/language_2/issue10747_test.dart b/tests/language_2/regress/regress10747_test.dart
similarity index 100%
rename from tests/language_2/issue10747_test.dart
rename to tests/language_2/regress/regress10747_test.dart
diff --git a/tests/language_2/issue10783_test.dart b/tests/language_2/regress/regress10783_test.dart
similarity index 100%
rename from tests/language_2/issue10783_test.dart
rename to tests/language_2/regress/regress10783_test.dart
diff --git a/tests/language_2/regress_10996_lib.dart b/tests/language_2/regress/regress10996_lib.dart
similarity index 100%
rename from tests/language_2/regress_10996_lib.dart
rename to tests/language_2/regress/regress10996_lib.dart
diff --git a/tests/language_2/regress_10996_test.dart b/tests/language_2/regress/regress10996_test.dart
similarity index 93%
rename from tests/language_2/regress_10996_test.dart
rename to tests/language_2/regress/regress10996_test.dart
index 4aefa941e61..eee00956c64 100644
--- a/tests/language_2/regress_10996_test.dart
+++ b/tests/language_2/regress/regress10996_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import "regress_10996_lib.dart" as lib;
+import "regress10996_lib.dart" as lib;
 
 foo(a, [b]) {
   return a + b + lib.a + lib.b;
diff --git a/tests/language_2/regress_11010_test.dart b/tests/language_2/regress/regress11010_test.dart
similarity index 100%
rename from tests/language_2/regress_11010_test.dart
rename to tests/language_2/regress/regress11010_test.dart
diff --git a/tests/language_2/issue11724_runtime_test.dart b/tests/language_2/regress/regress11724_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue11724_runtime_test.dart
rename to tests/language_2/regress/regress11724_runtime_test.dart
diff --git a/tests/language_2/issue11724_test.dart b/tests/language_2/regress/regress11724_test.dart
similarity index 100%
rename from tests/language_2/issue11724_test.dart
rename to tests/language_2/regress/regress11724_test.dart
diff --git a/tests/language_2/issue11793_test.dart b/tests/language_2/regress/regress11793_test.dart
similarity index 100%
rename from tests/language_2/issue11793_test.dart
rename to tests/language_2/regress/regress11793_test.dart
diff --git a/tests/language_2/regress_11800_test.dart b/tests/language_2/regress/regress11800_test.dart
similarity index 100%
rename from tests/language_2/regress_11800_test.dart
rename to tests/language_2/regress/regress11800_test.dart
diff --git a/tests/language_2/issue12023_test.dart b/tests/language_2/regress/regress12023_test.dart
similarity index 100%
rename from tests/language_2/issue12023_test.dart
rename to tests/language_2/regress/regress12023_test.dart
diff --git a/tests/language_2/crash_12118_test.dart b/tests/language_2/regress/regress12118_test.dart
similarity index 100%
rename from tests/language_2/crash_12118_test.dart
rename to tests/language_2/regress/regress12118_test.dart
diff --git a/tests/language_2/issue12284_test.dart b/tests/language_2/regress/regress12284_test.dart
similarity index 95%
rename from tests/language_2/issue12284_test.dart
rename to tests/language_2/regress/regress12284_test.dart
index b672e401159..d8f8f06bd11 100644
--- a/tests/language_2/issue12284_test.dart
+++ b/tests/language_2/regress/regress12284_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 class A {
   int field;
diff --git a/tests/language_2/issue12288_test.dart b/tests/language_2/regress/regress12288_test.dart
similarity index 100%
rename from tests/language_2/issue12288_test.dart
rename to tests/language_2/regress/regress12288_test.dart
diff --git a/tests/language_2/issue12336_test.dart b/tests/language_2/regress/regress12336_test.dart
similarity index 95%
rename from tests/language_2/issue12336_test.dart
rename to tests/language_2/regress/regress12336_test.dart
index 8e61d10e908..029c3f1c3f3 100644
--- a/tests/language_2/issue12336_test.dart
+++ b/tests/language_2/regress/regress12336_test.dart
@@ -6,7 +6,7 @@
 // [foo].
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 main() {
   var result = foo(1, 2);
diff --git a/tests/language_2/regress_124683_test.dart b/tests/language_2/regress/regress124683_test.dart
similarity index 99%
rename from tests/language_2/regress_124683_test.dart
rename to tests/language_2/regress/regress124683_test.dart
index 4efe4f6c627..d3059032871 100644
--- a/tests/language_2/regress_124683_test.dart
+++ b/tests/language_2/regress/regress124683_test.dart
@@ -15,4 +15,4 @@ class Class {
 
 main() {
   new Class().toString();
-}
\ No newline at end of file
+}
diff --git a/tests/language_2/regress_12561_test.dart b/tests/language_2/regress/regress12561_test.dart
similarity index 100%
rename from tests/language_2/regress_12561_test.dart
rename to tests/language_2/regress/regress12561_test.dart
diff --git a/tests/language_2/regress_12615_test.dart b/tests/language_2/regress/regress12615_test.dart
similarity index 100%
rename from tests/language_2/regress_12615_test.dart
rename to tests/language_2/regress/regress12615_test.dart
diff --git a/tests/language_2/issue13179_test.dart b/tests/language_2/regress/regress13179_test.dart
similarity index 100%
rename from tests/language_2/issue13179_test.dart
rename to tests/language_2/regress/regress13179_test.dart
diff --git a/tests/language_2/regress_13494_test.dart b/tests/language_2/regress/regress13494_test.dart
similarity index 100%
rename from tests/language_2/regress_13494_test.dart
rename to tests/language_2/regress/regress13494_test.dart
diff --git a/tests/language_2/issue13556_test.dart b/tests/language_2/regress/regress13556_test.dart
similarity index 100%
rename from tests/language_2/issue13556_test.dart
rename to tests/language_2/regress/regress13556_test.dart
diff --git a/tests/language_2/issue1363_lib.dart b/tests/language_2/regress/regress1363_lib.dart
similarity index 100%
rename from tests/language_2/issue1363_lib.dart
rename to tests/language_2/regress/regress1363_lib.dart
diff --git a/tests/language_2/issue1363_runtime_test.dart b/tests/language_2/regress/regress1363_runtime_test.dart
similarity index 94%
rename from tests/language_2/issue1363_runtime_test.dart
rename to tests/language_2/regress/regress1363_runtime_test.dart
index 8635ed6844c..f3f5eb1c58c 100644
--- a/tests/language_2/issue1363_runtime_test.dart
+++ b/tests/language_2/regress/regress1363_runtime_test.dart
@@ -8,7 +8,7 @@
 
 library Issue1363Test.dart;
 
-import 'issue1363_lib.dart' as lib;
+import 'regress1363_lib.dart' as lib;
 
 main() {
   new C().test();
diff --git a/tests/language_2/issue1363_test.dart b/tests/language_2/regress/regress1363_test.dart
similarity index 95%
rename from tests/language_2/issue1363_test.dart
rename to tests/language_2/regress/regress1363_test.dart
index 969d9320d1e..cd7df8ffa93 100644
--- a/tests/language_2/issue1363_test.dart
+++ b/tests/language_2/regress/regress1363_test.dart
@@ -5,7 +5,7 @@
 
 library Issue1363Test.dart;
 
-import 'issue1363_lib.dart' as lib;
+import 'regress1363_lib.dart' as lib;
 
 main() {
   new C().test();
diff --git a/tests/language_2/issue13673_test.dart b/tests/language_2/regress/regress13673_test.dart
similarity index 100%
rename from tests/language_2/issue13673_test.dart
rename to tests/language_2/regress/regress13673_test.dart
diff --git a/tests/language_2/issue14014_2_test.dart b/tests/language_2/regress/regress14014_2_test.dart
similarity index 100%
rename from tests/language_2/issue14014_2_test.dart
rename to tests/language_2/regress/regress14014_2_test.dart
diff --git a/tests/language_2/issue14014_3_test.dart b/tests/language_2/regress/regress14014_3_test.dart
similarity index 100%
rename from tests/language_2/issue14014_3_test.dart
rename to tests/language_2/regress/regress14014_3_test.dart
diff --git a/tests/language_2/issue14014_test.dart b/tests/language_2/regress/regress14014_test.dart
similarity index 100%
rename from tests/language_2/issue14014_test.dart
rename to tests/language_2/regress/regress14014_test.dart
diff --git a/tests/language_2/regress_14105_test.dart b/tests/language_2/regress/regress14105_test.dart
similarity index 100%
rename from tests/language_2/regress_14105_test.dart
rename to tests/language_2/regress/regress14105_test.dart
diff --git a/tests/language_2/issue14242_test.dart b/tests/language_2/regress/regress14242_test.dart
similarity index 100%
rename from tests/language_2/issue14242_test.dart
rename to tests/language_2/regress/regress14242_test.dart
diff --git a/tests/language_2/regress_14348_test.dart b/tests/language_2/regress/regress14348_test.dart
similarity index 100%
rename from tests/language_2/regress_14348_test.dart
rename to tests/language_2/regress/regress14348_test.dart
diff --git a/tests/language_2/issue15606_runtime_test.dart b/tests/language_2/regress/regress15606_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue15606_runtime_test.dart
rename to tests/language_2/regress/regress15606_runtime_test.dart
diff --git a/tests/language_2/issue15606_test.dart b/tests/language_2/regress/regress15606_test.dart
similarity index 100%
rename from tests/language_2/issue15606_test.dart
rename to tests/language_2/regress/regress15606_test.dart
diff --git a/tests/language_2/issue15702_test.dart b/tests/language_2/regress/regress15702_test.dart
similarity index 100%
rename from tests/language_2/issue15702_test.dart
rename to tests/language_2/regress/regress15702_test.dart
diff --git a/tests/language_2/issue15720_test.dart b/tests/language_2/regress/regress15720_test.dart
similarity index 100%
rename from tests/language_2/issue15720_test.dart
rename to tests/language_2/regress/regress15720_test.dart
diff --git a/tests/language_2/issue1578_test.dart b/tests/language_2/regress/regress1578_test.dart
similarity index 100%
rename from tests/language_2/issue1578_test.dart
rename to tests/language_2/regress/regress1578_test.dart
diff --git a/tests/language_2/regress_16640_test.dart b/tests/language_2/regress/regress16640_test.dart
similarity index 100%
rename from tests/language_2/regress_16640_test.dart
rename to tests/language_2/regress/regress16640_test.dart
diff --git a/tests/language_2/regress_17382_test.dart b/tests/language_2/regress/regress17382_test.dart
similarity index 100%
rename from tests/language_2/regress_17382_test.dart
rename to tests/language_2/regress/regress17382_test.dart
diff --git a/tests/language_2/regress/regress1751477_lib1.dart b/tests/language_2/regress/regress1751477_lib1.dart
new file mode 100644
index 00000000000..b0398a193ba
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib1.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib1;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib1_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib11.dart b/tests/language_2/regress/regress1751477_lib11.dart
new file mode 100644
index 00000000000..8b736284f8b
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib11.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib11;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib11_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib2.dart b/tests/language_2/regress/regress1751477_lib2.dart
new file mode 100644
index 00000000000..61c075617af
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib2.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib2;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib2_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib21.dart b/tests/language_2/regress/regress1751477_lib21.dart
new file mode 100644
index 00000000000..d3a85467d27
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib21.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib21;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib21_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib3.dart b/tests/language_2/regress/regress1751477_lib3.dart
new file mode 100644
index 00000000000..caec885c552
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib3.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib3;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib3_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib31.dart b/tests/language_2/regress/regress1751477_lib31.dart
new file mode 100644
index 00000000000..93412ad2319
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib31.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib31;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib31_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib4.dart b/tests/language_2/regress/regress1751477_lib4.dart
new file mode 100644
index 00000000000..e12cb886242
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib4.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib4;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib4_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib41.dart b/tests/language_2/regress/regress1751477_lib41.dart
new file mode 100644
index 00000000000..a4c5536b0ee
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib41.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib41;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib41_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib5.dart b/tests/language_2/regress/regress1751477_lib5.dart
new file mode 100644
index 00000000000..2049e2866e2
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib5.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib5;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib5_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib51.dart b/tests/language_2/regress/regress1751477_lib51.dart
new file mode 100644
index 00000000000..31bff9fbb84
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib51.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib51;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib51_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib6.dart b/tests/language_2/regress/regress1751477_lib6.dart
new file mode 100644
index 00000000000..9255cfde4b5
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib6.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib6;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib6_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib61.dart b/tests/language_2/regress/regress1751477_lib61.dart
new file mode 100644
index 00000000000..93a4ac37b4a
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib61.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib61;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib61_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib7.dart b/tests/language_2/regress/regress1751477_lib7.dart
new file mode 100644
index 00000000000..35fe1d138e5
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib7.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib7;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib7_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib71.dart b/tests/language_2/regress/regress1751477_lib71.dart
new file mode 100644
index 00000000000..e80f0c5ada0
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib71.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib71;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib71_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib8.dart b/tests/language_2/regress/regress1751477_lib8.dart
new file mode 100644
index 00000000000..e4240a04274
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib8.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib8;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib8_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib81.dart b/tests/language_2/regress/regress1751477_lib81.dart
new file mode 100644
index 00000000000..050e005bf1f
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib81.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib81;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib91.dart';
+
+lib81_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib9.dart b/tests/language_2/regress/regress1751477_lib9.dart
new file mode 100644
index 00000000000..fea7a64cb25
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib9.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib9;
+
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib1.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+import 'regress1751477_lib91.dart';
+
+lib9_func() {}
diff --git a/tests/language_2/regress/regress1751477_lib91.dart b/tests/language_2/regress/regress1751477_lib91.dart
new file mode 100644
index 00000000000..d1221254933
--- /dev/null
+++ b/tests/language_2/regress/regress1751477_lib91.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library lib91;
+
+import 'regress1751477_lib1.dart';
+import 'regress1751477_lib2.dart';
+import 'regress1751477_lib3.dart';
+import 'regress1751477_lib4.dart';
+import 'regress1751477_lib5.dart';
+import 'regress1751477_lib6.dart';
+import 'regress1751477_lib7.dart';
+import 'regress1751477_lib8.dart';
+import 'regress1751477_lib9.dart';
+
+import 'regress1751477_lib11.dart';
+import 'regress1751477_lib21.dart';
+import 'regress1751477_lib31.dart';
+import 'regress1751477_lib41.dart';
+import 'regress1751477_lib51.dart';
+import 'regress1751477_lib61.dart';
+import 'regress1751477_lib71.dart';
+import 'regress1751477_lib81.dart';
+
+lib91_func() {}
diff --git a/tests/language_2/issue_1751477_test.dart b/tests/language_2/regress/regress1751477_test.dart
similarity index 59%
rename from tests/language_2/issue_1751477_test.dart
rename to tests/language_2/regress/regress1751477_test.dart
index c821cb9371e..647fa90ca25 100644
--- a/tests/language_2/issue_1751477_test.dart
+++ b/tests/language_2/regress/regress1751477_test.dart
@@ -2,15 +2,15 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'issue_1751477_lib1.dart' deferred as lib1;
-import 'issue_1751477_lib2.dart' deferred as lib2;
-import 'issue_1751477_lib3.dart' deferred as lib3;
-import 'issue_1751477_lib4.dart' deferred as lib4;
-import 'issue_1751477_lib5.dart' deferred as lib5;
-import 'issue_1751477_lib6.dart' deferred as lib6;
-import 'issue_1751477_lib7.dart' deferred as lib7;
-import 'issue_1751477_lib8.dart' deferred as lib8;
-import 'issue_1751477_lib9.dart' deferred as lib9;
+import 'regress1751477_lib1.dart' deferred as lib1;
+import 'regress1751477_lib2.dart' deferred as lib2;
+import 'regress1751477_lib3.dart' deferred as lib3;
+import 'regress1751477_lib4.dart' deferred as lib4;
+import 'regress1751477_lib5.dart' deferred as lib5;
+import 'regress1751477_lib6.dart' deferred as lib6;
+import 'regress1751477_lib7.dart' deferred as lib7;
+import 'regress1751477_lib8.dart' deferred as lib8;
+import 'regress1751477_lib9.dart' deferred as lib9;
 
 main() {
   lib1.loadLibrary().then((_) {
diff --git a/tests/language_2/regress_18435_test.dart b/tests/language_2/regress/regress18435_test.dart
similarity index 100%
rename from tests/language_2/regress_18435_test.dart
rename to tests/language_2/regress/regress18435_test.dart
diff --git a/tests/language_2/issue18628_1_runtime_test.dart b/tests/language_2/regress/regress18628_1_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue18628_1_runtime_test.dart
rename to tests/language_2/regress/regress18628_1_runtime_test.dart
diff --git a/tests/language_2/issue18628_1_test.dart b/tests/language_2/regress/regress18628_1_test.dart
similarity index 100%
rename from tests/language_2/issue18628_1_test.dart
rename to tests/language_2/regress/regress18628_1_test.dart
diff --git a/tests/language_2/issue18628_2_runtime_test.dart b/tests/language_2/regress/regress18628_2_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue18628_2_runtime_test.dart
rename to tests/language_2/regress/regress18628_2_runtime_test.dart
diff --git a/tests/language_2/issue18628_2_test.dart b/tests/language_2/regress/regress18628_2_test.dart
similarity index 100%
rename from tests/language_2/issue18628_2_test.dart
rename to tests/language_2/regress/regress18628_2_test.dart
diff --git a/tests/language_2/regress_18713_test.dart b/tests/language_2/regress/regress18713_test.dart
similarity index 100%
rename from tests/language_2/regress_18713_test.dart
rename to tests/language_2/regress/regress18713_test.dart
diff --git a/tests/language_2/regress_18865_test.dart b/tests/language_2/regress/regress18865_test.dart
similarity index 100%
rename from tests/language_2/regress_18865_test.dart
rename to tests/language_2/regress/regress18865_test.dart
diff --git a/tests/language_2/regress_19413_bar.dart b/tests/language_2/regress/regress19413_bar.dart
similarity index 100%
rename from tests/language_2/regress_19413_bar.dart
rename to tests/language_2/regress/regress19413_bar.dart
diff --git a/tests/language_2/regress_19413_foo.dart b/tests/language_2/regress/regress19413_foo.dart
similarity index 100%
rename from tests/language_2/regress_19413_foo.dart
rename to tests/language_2/regress/regress19413_foo.dart
diff --git a/tests/language_2/regress_19413_test.dart b/tests/language_2/regress/regress19413_test.dart
similarity index 79%
rename from tests/language_2/regress_19413_test.dart
rename to tests/language_2/regress/regress19413_test.dart
index e68196a2fd9..eb0e2ad6297 100644
--- a/tests/language_2/regress_19413_test.dart
+++ b/tests/language_2/regress/regress19413_test.dart
@@ -4,8 +4,8 @@
 
 // Regression test for issue 19413.
 
-import 'regress_19413_foo.dart' as foo;
-import 'regress_19413_bar.dart' as foo;
+import 'regress19413_foo.dart' as foo;
+import 'regress19413_bar.dart' as foo;
 
 main() {
   foo.f(); /*@compile-error=unspecified*/
diff --git a/tests/language_2/regress_19728_test.dart b/tests/language_2/regress/regress19728_test.dart
similarity index 100%
rename from tests/language_2/regress_19728_test.dart
rename to tests/language_2/regress/regress19728_test.dart
diff --git a/tests/language_2/regress_20074_test.dart b/tests/language_2/regress/regress20074_test.dart
similarity index 100%
rename from tests/language_2/regress_20074_test.dart
rename to tests/language_2/regress/regress20074_test.dart
diff --git a/tests/language_2/regress_20394_lib.dart b/tests/language_2/regress/regress20394_lib.dart
similarity index 100%
rename from tests/language_2/regress_20394_lib.dart
rename to tests/language_2/regress/regress20394_lib.dart
diff --git a/tests/language_2/regress_20394_runtime_test.dart b/tests/language_2/regress/regress20394_runtime_test.dart
similarity index 84%
rename from tests/language_2/regress_20394_runtime_test.dart
rename to tests/language_2/regress/regress20394_runtime_test.dart
index 6547d3b8969..80da6baa862 100644
--- a/tests/language_2/regress_20394_runtime_test.dart
+++ b/tests/language_2/regress/regress20394_runtime_test.dart
@@ -1,7 +1,7 @@
 // TODO(multitest): This was automatically migrated from a multitest and may
 // contain strange or dead code.
 
-import 'regress_20394_lib.dart';
+import 'regress20394_lib.dart';
 
 class M {}
 
diff --git a/tests/language_2/regress_20394_test.dart b/tests/language_2/regress/regress20394_test.dart
similarity index 88%
rename from tests/language_2/regress_20394_test.dart
rename to tests/language_2/regress/regress20394_test.dart
index 1e88571e089..daff29b0fd7 100644
--- a/tests/language_2/regress_20394_test.dart
+++ b/tests/language_2/regress/regress20394_test.dart
@@ -1,4 +1,4 @@
-import 'regress_20394_lib.dart';
+import 'regress20394_lib.dart';
 
 class M {}
 
diff --git a/tests/language_2/issue20476_test.dart b/tests/language_2/regress/regress20476_test.dart
similarity index 100%
rename from tests/language_2/issue20476_test.dart
rename to tests/language_2/regress/regress20476_test.dart
diff --git a/tests/language_2/regress_20840_test.dart b/tests/language_2/regress/regress20840_test.dart
similarity index 100%
rename from tests/language_2/regress_20840_test.dart
rename to tests/language_2/regress/regress20840_test.dart
diff --git a/tests/language_2/regress_21016_test.dart b/tests/language_2/regress/regress21016_test.dart
similarity index 100%
rename from tests/language_2/regress_21016_test.dart
rename to tests/language_2/regress/regress21016_test.dart
diff --git a/tests/language_2/regress_21793_runtime_test.dart b/tests/language_2/regress/regress21793_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_21793_runtime_test.dart
rename to tests/language_2/regress/regress21793_runtime_test.dart
diff --git a/tests/language_2/regress_21793_test.dart b/tests/language_2/regress/regress21793_test.dart
similarity index 100%
rename from tests/language_2/regress_21793_test.dart
rename to tests/language_2/regress/regress21793_test.dart
diff --git a/tests/language_2/regress_21795_test.dart b/tests/language_2/regress/regress21795_test.dart
similarity index 100%
rename from tests/language_2/regress_21795_test.dart
rename to tests/language_2/regress/regress21795_test.dart
diff --git a/tests/language_2/regress_21912_runtime_test.dart b/tests/language_2/regress/regress21912_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_21912_runtime_test.dart
rename to tests/language_2/regress/regress21912_runtime_test.dart
diff --git a/tests/language_2/regress_21912_test.dart b/tests/language_2/regress/regress21912_test.dart
similarity index 100%
rename from tests/language_2/regress_21912_test.dart
rename to tests/language_2/regress/regress21912_test.dart
diff --git a/tests/language_2/issue21957_double_test.dart b/tests/language_2/regress/regress21957_double_test.dart
similarity index 100%
rename from tests/language_2/issue21957_double_test.dart
rename to tests/language_2/regress/regress21957_double_test.dart
diff --git a/tests/language_2/issue21957_float32x4_test.dart b/tests/language_2/regress/regress21957_float32x4_test.dart
similarity index 100%
rename from tests/language_2/issue21957_float32x4_test.dart
rename to tests/language_2/regress/regress21957_float32x4_test.dart
diff --git a/tests/language_2/issue21957_float64x2_test.dart b/tests/language_2/regress/regress21957_float64x2_test.dart
similarity index 100%
rename from tests/language_2/issue21957_float64x2_test.dart
rename to tests/language_2/regress/regress21957_float64x2_test.dart
diff --git a/tests/language_2/regress_21998_1_test.dart b/tests/language_2/regress/regress21998_1_test.dart
similarity index 100%
rename from tests/language_2/regress_21998_1_test.dart
rename to tests/language_2/regress/regress21998_1_test.dart
diff --git a/tests/language_2/regress_21998_2_test.dart b/tests/language_2/regress/regress21998_2_test.dart
similarity index 91%
rename from tests/language_2/regress_21998_2_test.dart
rename to tests/language_2/regress/regress21998_2_test.dart
index 6441f7f72d4..9214d6bbf76 100644
--- a/tests/language_2/regress_21998_2_test.dart
+++ b/tests/language_2/regress/regress21998_2_test.dart
@@ -4,7 +4,7 @@
 
 import 'dart:math' as Math;
 import 'package:expect/expect.dart';
-import 'regress_21998_lib1.dart' as lib1;
+import 'regress21998_lib1.dart' as lib1;
 
 main() {
   Expect.equals(4, new C().m());
diff --git a/tests/language_2/regress_21998_3_test.dart b/tests/language_2/regress/regress21998_3_test.dart
similarity index 85%
rename from tests/language_2/regress_21998_3_test.dart
rename to tests/language_2/regress/regress21998_3_test.dart
index 3233adc3f85..ebd3782cdb0 100644
--- a/tests/language_2/regress_21998_3_test.dart
+++ b/tests/language_2/regress/regress21998_3_test.dart
@@ -4,8 +4,8 @@
 
 import 'dart:math' as Math;
 import 'package:expect/expect.dart';
-import 'regress_21998_lib1.dart' as lib1;
-import 'regress_21998_lib2.dart';
+import 'regress21998_lib1.dart' as lib1;
+import 'regress21998_lib2.dart';
 
 main() {
   Expect.equals(4, new C().m());
diff --git a/tests/language_2/regress_21998_4_test.dart b/tests/language_2/regress/regress21998_4_test.dart
similarity index 81%
rename from tests/language_2/regress_21998_4_test.dart
rename to tests/language_2/regress/regress21998_4_test.dart
index a7b2196a782..6bc8c038203 100644
--- a/tests/language_2/regress_21998_4_test.dart
+++ b/tests/language_2/regress/regress21998_4_test.dart
@@ -4,9 +4,9 @@
 
 import 'dart:math' as Math;
 import 'package:expect/expect.dart';
-import 'regress_21998_lib1.dart' as lib1;
-import 'regress_21998_lib2.dart';
-import 'regress_21998_lib3.dart';
+import 'regress21998_lib1.dart' as lib1;
+import 'regress21998_lib2.dart';
+import 'regress21998_lib3.dart';
 
 main() {
   Expect.equals(4, new C().m());
diff --git a/tests/language_2/regress_21998_lib1.dart b/tests/language_2/regress/regress21998_lib1.dart
similarity index 100%
rename from tests/language_2/regress_21998_lib1.dart
rename to tests/language_2/regress/regress21998_lib1.dart
diff --git a/tests/language_2/regress_21998_lib2.dart b/tests/language_2/regress/regress21998_lib2.dart
similarity index 100%
rename from tests/language_2/regress_21998_lib2.dart
rename to tests/language_2/regress/regress21998_lib2.dart
diff --git a/tests/language_2/regress_21998_lib3.dart b/tests/language_2/regress/regress21998_lib3.dart
similarity index 100%
rename from tests/language_2/regress_21998_lib3.dart
rename to tests/language_2/regress/regress21998_lib3.dart
diff --git a/tests/language_2/regress_22438_test.dart b/tests/language_2/regress/regress22438_test.dart
similarity index 100%
rename from tests/language_2/regress_22438_test.dart
rename to tests/language_2/regress/regress22438_test.dart
diff --git a/tests/language_2/regress_22443_lib.dart b/tests/language_2/regress/regress22443_lib.dart
similarity index 100%
rename from tests/language_2/regress_22443_lib.dart
rename to tests/language_2/regress/regress22443_lib.dart
diff --git a/tests/language_2/regress_22443_test.dart b/tests/language_2/regress/regress22443_test.dart
similarity index 91%
rename from tests/language_2/regress_22443_test.dart
rename to tests/language_2/regress/regress22443_test.dart
index d3fbe9ca638..81a1e5d311d 100644
--- a/tests/language_2/regress_22443_test.dart
+++ b/tests/language_2/regress/regress22443_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'regress_22443_lib.dart' deferred as D;
+import 'regress22443_lib.dart' deferred as D;
 import 'package:expect/expect.dart';
 
 int fooCount = 0;
diff --git a/tests/language_2/regress_22445_test.dart b/tests/language_2/regress/regress22445_test.dart
similarity index 100%
rename from tests/language_2/regress_22445_test.dart
rename to tests/language_2/regress/regress22445_test.dart
diff --git a/tests/language_2/regress_22579_test.dart b/tests/language_2/regress/regress22579_test.dart
similarity index 100%
rename from tests/language_2/regress_22579_test.dart
rename to tests/language_2/regress/regress22579_test.dart
diff --git a/tests/language_2/regress_22666_test.dart b/tests/language_2/regress/regress22666_test.dart
similarity index 100%
rename from tests/language_2/regress_22666_test.dart
rename to tests/language_2/regress/regress22666_test.dart
diff --git a/tests/language_2/regress_22700_test.dart b/tests/language_2/regress/regress22700_test.dart
similarity index 100%
rename from tests/language_2/regress_22700_test.dart
rename to tests/language_2/regress/regress22700_test.dart
diff --git a/tests/language_2/regress_22719_test.dart b/tests/language_2/regress/regress22719_test.dart
similarity index 100%
rename from tests/language_2/regress_22719_test.dart
rename to tests/language_2/regress/regress22719_test.dart
diff --git a/tests/language_2/regress_22728_test.dart b/tests/language_2/regress/regress22728_test.dart
similarity index 100%
rename from tests/language_2/regress_22728_test.dart
rename to tests/language_2/regress/regress22728_test.dart
diff --git a/tests/language_2/regress_22777_test.dart b/tests/language_2/regress/regress22777_test.dart
similarity index 100%
rename from tests/language_2/regress_22777_test.dart
rename to tests/language_2/regress/regress22777_test.dart
diff --git a/tests/language_2/issue_22780_test.dart b/tests/language_2/regress/regress22780_test.dart
similarity index 100%
rename from tests/language_2/issue_22780_test.dart
rename to tests/language_2/regress/regress22780_test.dart
diff --git a/tests/language_2/issue22800_test.dart b/tests/language_2/regress/regress22800_test.dart
similarity index 100%
rename from tests/language_2/issue22800_test.dart
rename to tests/language_2/regress/regress22800_test.dart
diff --git a/tests/language_2/regress_22822_test.dart b/tests/language_2/regress/regress22822_test.dart
similarity index 100%
rename from tests/language_2/regress_22822_test.dart
rename to tests/language_2/regress/regress22822_test.dart
diff --git a/tests/language_2/regress_22858_test.dart b/tests/language_2/regress/regress22858_test.dart
similarity index 100%
rename from tests/language_2/regress_22858_test.dart
rename to tests/language_2/regress/regress22858_test.dart
diff --git a/tests/language_2/regress_22936_test.dart b/tests/language_2/regress/regress22936_test.dart
similarity index 100%
rename from tests/language_2/regress_22936_test.dart
rename to tests/language_2/regress/regress22936_test.dart
diff --git a/tests/language_2/regress_22976_test.dart b/tests/language_2/regress/regress22976_test.dart
similarity index 100%
rename from tests/language_2/regress_22976_test.dart
rename to tests/language_2/regress/regress22976_test.dart
diff --git a/tests/language_2/regress_23038_runtime_test.dart b/tests/language_2/regress/regress23038_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_23038_runtime_test.dart
rename to tests/language_2/regress/regress23038_runtime_test.dart
diff --git a/tests/language_2/regress_23038_test.dart b/tests/language_2/regress/regress23038_test.dart
similarity index 100%
rename from tests/language_2/regress_23038_test.dart
rename to tests/language_2/regress/regress23038_test.dart
diff --git a/tests/language_2/regress_23046_test.dart b/tests/language_2/regress/regress23046_test.dart
similarity index 100%
rename from tests/language_2/regress_23046_test.dart
rename to tests/language_2/regress/regress23046_test.dart
diff --git a/tests/language_2/regress_23051_test.dart b/tests/language_2/regress/regress23051_test.dart
similarity index 100%
rename from tests/language_2/regress_23051_test.dart
rename to tests/language_2/regress/regress23051_test.dart
diff --git a/tests/language_2/regress_23089_test.dart b/tests/language_2/regress/regress23089_test.dart
similarity index 100%
rename from tests/language_2/regress_23089_test.dart
rename to tests/language_2/regress/regress23089_test.dart
diff --git a/tests/language_2/issue23244_test.dart b/tests/language_2/regress/regress23244_test.dart
similarity index 100%
rename from tests/language_2/issue23244_test.dart
rename to tests/language_2/regress/regress23244_test.dart
diff --git a/tests/language_2/regress_23408_lib.dart b/tests/language_2/regress/regress23408_lib.dart
similarity index 86%
rename from tests/language_2/regress_23408_lib.dart
rename to tests/language_2/regress/regress23408_lib.dart
index 64c49641a95..564c2eb62a3 100644
--- a/tests/language_2/regress_23408_lib.dart
+++ b/tests/language_2/regress/regress23408_lib.dart
@@ -4,7 +4,7 @@
 
 library regress_23408_lib;
 
-import "regress_23408_test.dart" as main;
+import "regress23408_test.dart" as main;
 
 class K extends main.C {
   K();
diff --git a/tests/language_2/regress_23408_test.dart b/tests/language_2/regress/regress23408_test.dart
similarity index 90%
rename from tests/language_2/regress_23408_test.dart
rename to tests/language_2/regress/regress23408_test.dart
index 5abf41dd38b..1ad8c552b6f 100644
--- a/tests/language_2/regress_23408_test.dart
+++ b/tests/language_2/regress/regress23408_test.dart
@@ -6,7 +6,7 @@ library regress_23408_test;
 
 import 'package:expect/expect.dart';
 
-import 'regress_23408_lib.dart' deferred as lib;
+import 'regress23408_lib.dart' deferred as lib;
 
 class C {
   var v = 55;
diff --git a/tests/language_2/regress_23408a_test.dart b/tests/language_2/regress/regress23408a_test.dart
similarity index 92%
rename from tests/language_2/regress_23408a_test.dart
rename to tests/language_2/regress/regress23408a_test.dart
index 32d3579ba20..b8fd7a4e547 100644
--- a/tests/language_2/regress_23408a_test.dart
+++ b/tests/language_2/regress/regress23408a_test.dart
@@ -6,7 +6,7 @@ library regress_23408a_test;
 
 import 'package:expect/expect.dart';
 
-import 'regress_23408_lib.dart' deferred as lib;
+import 'regress23408_lib.dart' deferred as lib;
 
 class A<T> extends C {
   get t => T;
diff --git a/tests/language_2/regress_23498_test.dart b/tests/language_2/regress/regress23498_test.dart
similarity index 100%
rename from tests/language_2/regress_23498_test.dart
rename to tests/language_2/regress/regress23498_test.dart
diff --git a/tests/language_2/regress_23500_test.dart b/tests/language_2/regress/regress23500_test.dart
similarity index 100%
rename from tests/language_2/regress_23500_test.dart
rename to tests/language_2/regress/regress23500_test.dart
diff --git a/tests/language_2/regress_23537_test.dart b/tests/language_2/regress/regress23537_test.dart
similarity index 100%
rename from tests/language_2/regress_23537_test.dart
rename to tests/language_2/regress/regress23537_test.dart
diff --git a/tests/language_2/regress_23650_test.dart b/tests/language_2/regress/regress23650_test.dart
similarity index 100%
rename from tests/language_2/regress_23650_test.dart
rename to tests/language_2/regress/regress23650_test.dart
diff --git a/tests/language_2/issue_23914_test.dart b/tests/language_2/regress/regress23914_test.dart
similarity index 100%
rename from tests/language_2/issue_23914_test.dart
rename to tests/language_2/regress/regress23914_test.dart
diff --git a/tests/language_2/regress_23996_test.dart b/tests/language_2/regress/regress23996_test.dart
similarity index 100%
rename from tests/language_2/regress_23996_test.dart
rename to tests/language_2/regress/regress23996_test.dart
diff --git a/tests/language_2/regress_24283_test.dart b/tests/language_2/regress/regress24283_test.dart
similarity index 100%
rename from tests/language_2/regress_24283_test.dart
rename to tests/language_2/regress/regress24283_test.dart
diff --git a/tests/language_2/regress_24567_test.dart b/tests/language_2/regress/regress24567_test.dart
similarity index 100%
rename from tests/language_2/regress_24567_test.dart
rename to tests/language_2/regress/regress24567_test.dart
diff --git a/tests/language_2/regress_24935_test.dart b/tests/language_2/regress/regress24935_test.dart
similarity index 100%
rename from tests/language_2/regress_24935_test.dart
rename to tests/language_2/regress/regress24935_test.dart
diff --git a/tests/language_2/regress_25122_test.dart b/tests/language_2/regress/regress25122_test.dart
similarity index 100%
rename from tests/language_2/regress_25122_test.dart
rename to tests/language_2/regress/regress25122_test.dart
diff --git a/tests/language_2/regress_25246_1_test.dart b/tests/language_2/regress/regress25246_1_test.dart
similarity index 91%
rename from tests/language_2/regress_25246_1_test.dart
rename to tests/language_2/regress/regress25246_1_test.dart
index 2df6b056235..65101deaab8 100644
--- a/tests/language_2/regress_25246_1_test.dart
+++ b/tests/language_2/regress/regress25246_1_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'regress_25246_2.dart';
+import 'regress25246_2.dart';
 
 class ConcreteClass extends Object with MixIn {}
 
diff --git a/tests/language_2/regress_25246_2.dart b/tests/language_2/regress/regress25246_2.dart
similarity index 90%
rename from tests/language_2/regress_25246_2.dart
rename to tests/language_2/regress/regress25246_2.dart
index 736818c89cf..3c91e73708b 100644
--- a/tests/language_2/regress_25246_2.dart
+++ b/tests/language_2/regress/regress25246_2.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'regress_25246_3.dart';
+import 'regress25246_3.dart';
 
 class MixIn {
   var test3 = new Test3(() {});
diff --git a/tests/language_2/regress_25246_3.dart b/tests/language_2/regress/regress25246_3.dart
similarity index 100%
rename from tests/language_2/regress_25246_3.dart
rename to tests/language_2/regress/regress25246_3.dart
diff --git a/tests/language_2/regress_25389_part.dart b/tests/language_2/regress/regress25389_part.dart
similarity index 100%
rename from tests/language_2/regress_25389_part.dart
rename to tests/language_2/regress/regress25389_part.dart
diff --git a/tests/language_2/regress_25389_test.dart b/tests/language_2/regress/regress25389_test.dart
similarity index 91%
rename from tests/language_2/regress_25389_test.dart
rename to tests/language_2/regress/regress25389_test.dart
index ad76eda9924..8a4b8827d4c 100644
--- a/tests/language_2/regress_25389_test.dart
+++ b/tests/language_2/regress/regress25389_test.dart
@@ -4,7 +4,7 @@
 
 library regress_25389;
 
-part 'regress_25389_part.dart';
+part 'regress25389_part.dart';
 
 main() {
   new IssueListEditorState();
diff --git a/tests/language_2/regress_25550_test.dart b/tests/language_2/regress/regress25550_test.dart
similarity index 100%
rename from tests/language_2/regress_25550_test.dart
rename to tests/language_2/regress/regress25550_test.dart
diff --git a/tests/language_2/regress_25568_test.dart b/tests/language_2/regress/regress25568_test.dart
similarity index 100%
rename from tests/language_2/regress_25568_test.dart
rename to tests/language_2/regress/regress25568_test.dart
diff --git a/tests/language_2/regress_25609_lib1.dart b/tests/language_2/regress/regress25609_lib1.dart
similarity index 88%
rename from tests/language_2/regress_25609_lib1.dart
rename to tests/language_2/regress/regress25609_lib1.dart
index 2be30116189..1e9c88655a8 100644
--- a/tests/language_2/regress_25609_lib1.dart
+++ b/tests/language_2/regress/regress25609_lib1.dart
@@ -4,6 +4,6 @@
 
 library regress_25609_lib1;
 
-import 'regress_25609_lib2.dart';
+import 'regress25609_lib2.dart';
 
 typedef Bar Foo(int y);
diff --git a/tests/language_2/regress_25609_lib2.dart b/tests/language_2/regress/regress25609_lib2.dart
similarity index 100%
rename from tests/language_2/regress_25609_lib2.dart
rename to tests/language_2/regress/regress25609_lib2.dart
diff --git a/tests/language_2/regress_25609_test.dart b/tests/language_2/regress/regress25609_test.dart
similarity index 88%
rename from tests/language_2/regress_25609_test.dart
rename to tests/language_2/regress/regress25609_test.dart
index 2cd030a0b09..074eca6c41b 100644
--- a/tests/language_2/regress_25609_test.dart
+++ b/tests/language_2/regress/regress25609_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'regress_25609_lib1.dart';
+import 'regress25609_lib1.dart';
 
 Foo baz() => null;
 
diff --git a/tests/language_2/regress_25620_test.dart b/tests/language_2/regress/regress25620_test.dart
similarity index 100%
rename from tests/language_2/regress_25620_test.dart
rename to tests/language_2/regress/regress25620_test.dart
diff --git a/tests/language_2/regress_25935_test.dart b/tests/language_2/regress/regress25935_test.dart
similarity index 100%
rename from tests/language_2/regress_25935_test.dart
rename to tests/language_2/regress/regress25935_test.dart
diff --git a/tests/language_2/regress_26133_test.dart b/tests/language_2/regress/regress26133_test.dart
similarity index 100%
rename from tests/language_2/regress_26133_test.dart
rename to tests/language_2/regress/regress26133_test.dart
diff --git a/tests/language_2/regress_26175_test.dart b/tests/language_2/regress/regress26175_test.dart
similarity index 100%
rename from tests/language_2/regress_26175_test.dart
rename to tests/language_2/regress/regress26175_test.dart
diff --git a/tests/language_2/regress_26230_test.dart b/tests/language_2/regress/regress26230_test.dart
similarity index 100%
rename from tests/language_2/regress_26230_test.dart
rename to tests/language_2/regress/regress26230_test.dart
diff --git a/tests/language_2/regress_26453_test.dart b/tests/language_2/regress/regress26453_test.dart
similarity index 100%
rename from tests/language_2/regress_26453_test.dart
rename to tests/language_2/regress/regress26453_test.dart
diff --git a/tests/language_2/regress_26530_test.dart b/tests/language_2/regress/regress26530_test.dart
similarity index 100%
rename from tests/language_2/regress_26530_test.dart
rename to tests/language_2/regress/regress26530_test.dart
diff --git a/tests/language_2/regress_26543_1_test.dart b/tests/language_2/regress/regress26543_1_test.dart
similarity index 100%
rename from tests/language_2/regress_26543_1_test.dart
rename to tests/language_2/regress/regress26543_1_test.dart
diff --git a/tests/language_2/regress_26543_2_test.dart b/tests/language_2/regress/regress26543_2_test.dart
similarity index 100%
rename from tests/language_2/regress_26543_2_test.dart
rename to tests/language_2/regress/regress26543_2_test.dart
diff --git a/tests/language_2/regress_26543_3_test.dart b/tests/language_2/regress/regress26543_3_test.dart
similarity index 100%
rename from tests/language_2/regress_26543_3_test.dart
rename to tests/language_2/regress/regress26543_3_test.dart
diff --git a/tests/language_2/regress_26668_test.dart b/tests/language_2/regress/regress26668_test.dart
similarity index 100%
rename from tests/language_2/regress_26668_test.dart
rename to tests/language_2/regress/regress26668_test.dart
diff --git a/tests/language_2/regress_26855_runtime_test.dart b/tests/language_2/regress/regress26855_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_26855_runtime_test.dart
rename to tests/language_2/regress/regress26855_runtime_test.dart
diff --git a/tests/language_2/regress_26855_test.dart b/tests/language_2/regress/regress26855_test.dart
similarity index 100%
rename from tests/language_2/regress_26855_test.dart
rename to tests/language_2/regress/regress26855_test.dart
diff --git a/tests/language_2/regress_26948_test.dart b/tests/language_2/regress/regress26948_test.dart
similarity index 100%
rename from tests/language_2/regress_26948_test.dart
rename to tests/language_2/regress/regress26948_test.dart
diff --git a/tests/language_2/regress_27164_test.dart b/tests/language_2/regress/regress27164_test.dart
similarity index 100%
rename from tests/language_2/regress_27164_test.dart
rename to tests/language_2/regress/regress27164_test.dart
diff --git a/tests/language_2/regress_27572_test.dart b/tests/language_2/regress/regress27572_test.dart
similarity index 100%
rename from tests/language_2/regress_27572_test.dart
rename to tests/language_2/regress/regress27572_test.dart
diff --git a/tests/language_2/regress_27617_runtime_test.dart b/tests/language_2/regress/regress27617_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_27617_runtime_test.dart
rename to tests/language_2/regress/regress27617_runtime_test.dart
diff --git a/tests/language_2/regress_27617_test.dart b/tests/language_2/regress/regress27617_test.dart
similarity index 100%
rename from tests/language_2/regress_27617_test.dart
rename to tests/language_2/regress/regress27617_test.dart
diff --git a/tests/language_2/regress_27659_test.dart b/tests/language_2/regress/regress27659_test.dart
similarity index 100%
rename from tests/language_2/regress_27659_test.dart
rename to tests/language_2/regress/regress27659_test.dart
diff --git a/tests/language_2/regress_27700_test.dart b/tests/language_2/regress/regress27700_test.dart
similarity index 100%
rename from tests/language_2/regress_27700_test.dart
rename to tests/language_2/regress/regress27700_test.dart
diff --git a/tests/language_2/regress_27957_lib1.dart b/tests/language_2/regress/regress27957_lib1.dart
similarity index 100%
rename from tests/language_2/regress_27957_lib1.dart
rename to tests/language_2/regress/regress27957_lib1.dart
diff --git a/tests/language_2/regress_27957_lib2.dart b/tests/language_2/regress/regress27957_lib2.dart
similarity index 100%
rename from tests/language_2/regress_27957_lib2.dart
rename to tests/language_2/regress/regress27957_lib2.dart
diff --git a/tests/language_2/regress_27957_test.dart b/tests/language_2/regress/regress27957_test.dart
similarity index 84%
rename from tests/language_2/regress_27957_test.dart
rename to tests/language_2/regress/regress27957_test.dart
index 3efa497e2ac..1c5dbcdbf43 100644
--- a/tests/language_2/regress_27957_test.dart
+++ b/tests/language_2/regress/regress27957_test.dart
@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import 'regress_27957_lib1.dart' as s1;
-import 'regress_27957_lib2.dart' as s2;
+import 'regress27957_lib1.dart' as s1;
+import 'regress27957_lib2.dart' as s2;
 
 class Mixin {}
 
diff --git a/tests/language_2/regress_28217_test.dart b/tests/language_2/regress/regress28217_test.dart
similarity index 100%
rename from tests/language_2/regress_28217_test.dart
rename to tests/language_2/regress/regress28217_test.dart
diff --git a/tests/language_2/regress_28268_test.dart b/tests/language_2/regress/regress28268_test.dart
similarity index 100%
rename from tests/language_2/regress_28268_test.dart
rename to tests/language_2/regress/regress28268_test.dart
diff --git a/tests/language_2/regress_28278_lib.dart b/tests/language_2/regress/regress28278_lib.dart
similarity index 100%
rename from tests/language_2/regress_28278_lib.dart
rename to tests/language_2/regress/regress28278_lib.dart
diff --git a/tests/language_2/regress_28278_test.dart b/tests/language_2/regress/regress28278_test.dart
similarity index 91%
rename from tests/language_2/regress_28278_test.dart
rename to tests/language_2/regress/regress28278_test.dart
index e65ef081ed1..aaeed57c32d 100644
--- a/tests/language_2/regress_28278_test.dart
+++ b/tests/language_2/regress/regress28278_test.dart
@@ -6,7 +6,7 @@
 
 import "package:expect/expect.dart";
 
-import "regress_28278_lib.dart" deferred as def;
+import "regress28278_lib.dart" deferred as def;
 
 var result = "";
 
diff --git a/tests/language_2/regress_28341_test.dart b/tests/language_2/regress/regress28341_test.dart
similarity index 100%
rename from tests/language_2/regress_28341_test.dart
rename to tests/language_2/regress/regress28341_test.dart
diff --git a/tests/language_2/issue28498_test.dart b/tests/language_2/regress/regress28498_test.dart
similarity index 100%
rename from tests/language_2/issue28498_test.dart
rename to tests/language_2/regress/regress28498_test.dart
diff --git a/tests/language_2/regress_28610_test.dart b/tests/language_2/regress/regress28610_test.dart
similarity index 100%
rename from tests/language_2/regress_28610_test.dart
rename to tests/language_2/regress/regress28610_test.dart
diff --git a/tests/language_2/regress_29025_test.dart b/tests/language_2/regress/regress29025_test.dart
similarity index 100%
rename from tests/language_2/regress_29025_test.dart
rename to tests/language_2/regress/regress29025_test.dart
diff --git a/tests/language_2/regress_29243_test.dart b/tests/language_2/regress/regress29243_test.dart
similarity index 100%
rename from tests/language_2/regress_29243_test.dart
rename to tests/language_2/regress/regress29243_test.dart
diff --git a/tests/language_2/regress_29349_test.dart b/tests/language_2/regress/regress29349_test.dart
similarity index 100%
rename from tests/language_2/regress_29349_test.dart
rename to tests/language_2/regress/regress29349_test.dart
diff --git a/tests/language_2/regress_29357_test.dart b/tests/language_2/regress/regress29357_test.dart
similarity index 100%
rename from tests/language_2/regress_29357_test.dart
rename to tests/language_2/regress/regress29357_test.dart
diff --git a/tests/language_2/regress_29784_runtime_test.dart b/tests/language_2/regress/regress29784_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_29784_runtime_test.dart
rename to tests/language_2/regress/regress29784_runtime_test.dart
diff --git a/tests/language_2/regress_29784_test.dart b/tests/language_2/regress/regress29784_test.dart
similarity index 100%
rename from tests/language_2/regress_29784_test.dart
rename to tests/language_2/regress/regress29784_test.dart
diff --git a/tests/language_2/regress_29949_test.dart b/tests/language_2/regress/regress29949_test.dart
similarity index 100%
rename from tests/language_2/regress_29949_test.dart
rename to tests/language_2/regress/regress29949_test.dart
diff --git a/tests/language_2/regress_30092_test.dart b/tests/language_2/regress/regress30092_test.dart
similarity index 100%
rename from tests/language_2/regress_30092_test.dart
rename to tests/language_2/regress/regress30092_test.dart
diff --git a/tests/language_2/regress_30121_test.dart b/tests/language_2/regress/regress30121_test.dart
similarity index 100%
rename from tests/language_2/regress_30121_test.dart
rename to tests/language_2/regress/regress30121_test.dart
diff --git a/tests/language_2/regress_30339_test.dart b/tests/language_2/regress/regress30339_test.dart
similarity index 100%
rename from tests/language_2/regress_30339_test.dart
rename to tests/language_2/regress/regress30339_test.dart
diff --git a/tests/language_2/regress_30516_test.dart b/tests/language_2/regress/regress30516_test.dart
similarity index 100%
rename from tests/language_2/regress_30516_test.dart
rename to tests/language_2/regress/regress30516_test.dart
diff --git a/tests/language_2/regress_30669_test.dart b/tests/language_2/regress/regress30669_test.dart
similarity index 100%
rename from tests/language_2/regress_30669_test.dart
rename to tests/language_2/regress/regress30669_test.dart
diff --git a/tests/language_2/regress_30927_test.dart b/tests/language_2/regress/regress30927_test.dart
similarity index 100%
rename from tests/language_2/regress_30927_test.dart
rename to tests/language_2/regress/regress30927_test.dart
diff --git a/tests/language_2/regress_31057_test.dart b/tests/language_2/regress/regress31057_test.dart
similarity index 100%
rename from tests/language_2/regress_31057_test.dart
rename to tests/language_2/regress/regress31057_test.dart
diff --git a/tests/language_2/regress_31066_test.dart b/tests/language_2/regress/regress31066_test.dart
similarity index 100%
rename from tests/language_2/regress_31066_test.dart
rename to tests/language_2/regress/regress31066_test.dart
diff --git a/tests/language_2/regress_31106_test.dart b/tests/language_2/regress/regress31106_test.dart
similarity index 100%
rename from tests/language_2/regress_31106_test.dart
rename to tests/language_2/regress/regress31106_test.dart
diff --git a/tests/language_2/regress_31279_test.dart b/tests/language_2/regress/regress31279_test.dart
similarity index 99%
rename from tests/language_2/regress_31279_test.dart
rename to tests/language_2/regress/regress31279_test.dart
index f61023cd9d3..57b0914378b 100644
--- a/tests/language_2/regress_31279_test.dart
+++ b/tests/language_2/regress/regress31279_test.dart
@@ -20,4 +20,4 @@ void VoidParsingIssue() {
 void main() {
   new CovariantParsingIssue();
   VoidParsingIssue();
-}
\ No newline at end of file
+}
diff --git a/tests/language_2/bug31436_test.dart b/tests/language_2/regress/regress31436_test.dart
similarity index 100%
rename from tests/language_2/bug31436_test.dart
rename to tests/language_2/regress/regress31436_test.dart
diff --git a/tests/language_2/regress_31591_test.dart b/tests/language_2/regress/regress31591_test.dart
similarity index 100%
rename from tests/language_2/regress_31591_test.dart
rename to tests/language_2/regress/regress31591_test.dart
diff --git a/tests/language_2/issue31596_covariant_declaration_test.dart b/tests/language_2/regress/regress31596_covariant_declaration_test.dart
similarity index 100%
rename from tests/language_2/issue31596_covariant_declaration_test.dart
rename to tests/language_2/regress/regress31596_covariant_declaration_test.dart
diff --git a/tests/language_2/issue31596_override_test.dart b/tests/language_2/regress/regress31596_override_test.dart
similarity index 100%
rename from tests/language_2/issue31596_override_test.dart
rename to tests/language_2/regress/regress31596_override_test.dart
diff --git a/tests/language_2/issue31596_runtime_test.dart b/tests/language_2/regress/regress31596_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue31596_runtime_test.dart
rename to tests/language_2/regress/regress31596_runtime_test.dart
diff --git a/tests/language_2/issue31596_super_runtime_1_test.dart b/tests/language_2/regress/regress31596_super_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/issue31596_super_runtime_1_test.dart
rename to tests/language_2/regress/regress31596_super_runtime_1_test.dart
diff --git a/tests/language_2/issue31596_super_runtime_2_test.dart b/tests/language_2/regress/regress31596_super_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/issue31596_super_runtime_2_test.dart
rename to tests/language_2/regress/regress31596_super_runtime_2_test.dart
diff --git a/tests/language_2/issue31596_super_runtime_3_test.dart b/tests/language_2/regress/regress31596_super_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/issue31596_super_runtime_3_test.dart
rename to tests/language_2/regress/regress31596_super_runtime_3_test.dart
diff --git a/tests/language_2/issue31596_super_runtime_test.dart b/tests/language_2/regress/regress31596_super_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue31596_super_runtime_test.dart
rename to tests/language_2/regress/regress31596_super_runtime_test.dart
diff --git a/tests/language_2/issue31596_super_test.dart b/tests/language_2/regress/regress31596_super_test.dart
similarity index 100%
rename from tests/language_2/issue31596_super_test.dart
rename to tests/language_2/regress/regress31596_super_test.dart
diff --git a/tests/language_2/issue31596_tearoff_test.dart b/tests/language_2/regress/regress31596_tearoff_test.dart
similarity index 100%
rename from tests/language_2/issue31596_tearoff_test.dart
rename to tests/language_2/regress/regress31596_tearoff_test.dart
diff --git a/tests/language_2/issue31596_test.dart b/tests/language_2/regress/regress31596_test.dart
similarity index 100%
rename from tests/language_2/issue31596_test.dart
rename to tests/language_2/regress/regress31596_test.dart
diff --git a/tests/language_2/regress_32012_test.dart b/tests/language_2/regress/regress32012_test.dart
similarity index 100%
rename from tests/language_2/regress_32012_test.dart
rename to tests/language_2/regress/regress32012_test.dart
diff --git a/tests/language_2/regress_32267_test.dart b/tests/language_2/regress/regress32267_test.dart
similarity index 100%
rename from tests/language_2/regress_32267_test.dart
rename to tests/language_2/regress/regress32267_test.dart
diff --git a/tests/language_2/bug32305_test.dart b/tests/language_2/regress/regress32305_test.dart
similarity index 100%
rename from tests/language_2/bug32305_test.dart
rename to tests/language_2/regress/regress32305_test.dart
diff --git a/tests/language_2/issue32353_2_test.dart b/tests/language_2/regress/regress32353_2_test.dart
similarity index 100%
rename from tests/language_2/issue32353_2_test.dart
rename to tests/language_2/regress/regress32353_2_test.dart
diff --git a/tests/language_2/issue32353_test.dart b/tests/language_2/regress/regress32353_test.dart
similarity index 100%
rename from tests/language_2/issue32353_test.dart
rename to tests/language_2/regress/regress32353_test.dart
diff --git a/tests/language_2/bug32372_test.dart b/tests/language_2/regress/regress32372_test.dart
similarity index 100%
rename from tests/language_2/bug32372_test.dart
rename to tests/language_2/regress/regress32372_test.dart
diff --git a/tests/language_2/regress_32425_test.dart b/tests/language_2/regress/regress32425_test.dart
similarity index 100%
rename from tests/language_2/regress_32425_test.dart
rename to tests/language_2/regress/regress32425_test.dart
diff --git a/tests/language_2/regress_32660_test.dart b/tests/language_2/regress/regress32660_test.dart
similarity index 100%
rename from tests/language_2/regress_32660_test.dart
rename to tests/language_2/regress/regress32660_test.dart
diff --git a/tests/language_2/regress_33009_lib.dart b/tests/language_2/regress/regress33009_lib.dart
similarity index 100%
rename from tests/language_2/regress_33009_lib.dart
rename to tests/language_2/regress/regress33009_lib.dart
diff --git a/tests/language_2/regress_33009_test.dart b/tests/language_2/regress/regress33009_test.dart
similarity index 89%
rename from tests/language_2/regress_33009_test.dart
rename to tests/language_2/regress/regress33009_test.dart
index 7291ff0f754..f951245d57b 100644
--- a/tests/language_2/regress_33009_test.dart
+++ b/tests/language_2/regress/regress33009_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'regress_33009_lib.dart';
+import 'regress33009_lib.dart';
 
 class A implements I<dynamic> {
   dynamic get foo => 1;
diff --git a/tests/language_2/regress_33235_01_runtime_test.dart b/tests/language_2/regress/regress33235_01_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_01_runtime_test.dart
rename to tests/language_2/regress/regress33235_01_runtime_test.dart
diff --git a/tests/language_2/regress_33235_01_test.dart b/tests/language_2/regress/regress33235_01_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_01_test.dart
rename to tests/language_2/regress/regress33235_01_test.dart
diff --git a/tests/language_2/regress_33235_02_runtime_test.dart b/tests/language_2/regress/regress33235_02_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_02_runtime_test.dart
rename to tests/language_2/regress/regress33235_02_runtime_test.dart
diff --git a/tests/language_2/regress_33235_02_test.dart b/tests/language_2/regress/regress33235_02_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_02_test.dart
rename to tests/language_2/regress/regress33235_02_test.dart
diff --git a/tests/language_2/regress_33235_03_runtime_test.dart b/tests/language_2/regress/regress33235_03_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_03_runtime_test.dart
rename to tests/language_2/regress/regress33235_03_runtime_test.dart
diff --git a/tests/language_2/regress_33235_03_test.dart b/tests/language_2/regress/regress33235_03_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_03_test.dart
rename to tests/language_2/regress/regress33235_03_test.dart
diff --git a/tests/language_2/regress_33235_04_runtime_test.dart b/tests/language_2/regress/regress33235_04_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_04_runtime_test.dart
rename to tests/language_2/regress/regress33235_04_runtime_test.dart
diff --git a/tests/language_2/regress_33235_04_test.dart b/tests/language_2/regress/regress33235_04_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_04_test.dart
rename to tests/language_2/regress/regress33235_04_test.dart
diff --git a/tests/language_2/regress_33235_05_runtime_test.dart b/tests/language_2/regress/regress33235_05_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_05_runtime_test.dart
rename to tests/language_2/regress/regress33235_05_runtime_test.dart
diff --git a/tests/language_2/regress_33235_05_test.dart b/tests/language_2/regress/regress33235_05_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_05_test.dart
rename to tests/language_2/regress/regress33235_05_test.dart
diff --git a/tests/language_2/regress_33235_06_runtime_test.dart b/tests/language_2/regress/regress33235_06_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_06_runtime_test.dart
rename to tests/language_2/regress/regress33235_06_runtime_test.dart
diff --git a/tests/language_2/regress_33235_06_test.dart b/tests/language_2/regress/regress33235_06_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_06_test.dart
rename to tests/language_2/regress/regress33235_06_test.dart
diff --git a/tests/language_2/regress_33235_07_runtime_test.dart b/tests/language_2/regress/regress33235_07_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_07_runtime_test.dart
rename to tests/language_2/regress/regress33235_07_runtime_test.dart
diff --git a/tests/language_2/regress_33235_07_test.dart b/tests/language_2/regress/regress33235_07_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_07_test.dart
rename to tests/language_2/regress/regress33235_07_test.dart
diff --git a/tests/language_2/regress_33235_08_runtime_test.dart b/tests/language_2/regress/regress33235_08_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_08_runtime_test.dart
rename to tests/language_2/regress/regress33235_08_runtime_test.dart
diff --git a/tests/language_2/regress_33235_08_test.dart b/tests/language_2/regress/regress33235_08_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_08_test.dart
rename to tests/language_2/regress/regress33235_08_test.dart
diff --git a/tests/language_2/regress_33235_09_runtime_test.dart b/tests/language_2/regress/regress33235_09_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_09_runtime_test.dart
rename to tests/language_2/regress/regress33235_09_runtime_test.dart
diff --git a/tests/language_2/regress_33235_09_test.dart b/tests/language_2/regress/regress33235_09_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_09_test.dart
rename to tests/language_2/regress/regress33235_09_test.dart
diff --git a/tests/language_2/regress_33235_10_runtime_test.dart b/tests/language_2/regress/regress33235_10_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_10_runtime_test.dart
rename to tests/language_2/regress/regress33235_10_runtime_test.dart
diff --git a/tests/language_2/regress_33235_10_test.dart b/tests/language_2/regress/regress33235_10_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_10_test.dart
rename to tests/language_2/regress/regress33235_10_test.dart
diff --git a/tests/language_2/regress_33235_11_runtime_test.dart b/tests/language_2/regress/regress33235_11_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_11_runtime_test.dart
rename to tests/language_2/regress/regress33235_11_runtime_test.dart
diff --git a/tests/language_2/regress_33235_11_test.dart b/tests/language_2/regress/regress33235_11_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_11_test.dart
rename to tests/language_2/regress/regress33235_11_test.dart
diff --git a/tests/language_2/regress_33235_12_runtime_test.dart b/tests/language_2/regress/regress33235_12_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_12_runtime_test.dart
rename to tests/language_2/regress/regress33235_12_runtime_test.dart
diff --git a/tests/language_2/regress_33235_12_test.dart b/tests/language_2/regress/regress33235_12_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_12_test.dart
rename to tests/language_2/regress/regress33235_12_test.dart
diff --git a/tests/language_2/regress_33235_13_runtime_test.dart b/tests/language_2/regress/regress33235_13_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_13_runtime_test.dart
rename to tests/language_2/regress/regress33235_13_runtime_test.dart
diff --git a/tests/language_2/regress_33235_13_test.dart b/tests/language_2/regress/regress33235_13_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_13_test.dart
rename to tests/language_2/regress/regress33235_13_test.dart
diff --git a/tests/language_2/regress_33235_14_runtime_test.dart b/tests/language_2/regress/regress33235_14_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_14_runtime_test.dart
rename to tests/language_2/regress/regress33235_14_runtime_test.dart
diff --git a/tests/language_2/regress_33235_14_test.dart b/tests/language_2/regress/regress33235_14_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_14_test.dart
rename to tests/language_2/regress/regress33235_14_test.dart
diff --git a/tests/language_2/regress_33235_15_runtime_test.dart b/tests/language_2/regress/regress33235_15_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_15_runtime_test.dart
rename to tests/language_2/regress/regress33235_15_runtime_test.dart
diff --git a/tests/language_2/regress_33235_15_test.dart b/tests/language_2/regress/regress33235_15_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_15_test.dart
rename to tests/language_2/regress/regress33235_15_test.dart
diff --git a/tests/language_2/regress_33235_16_runtime_test.dart b/tests/language_2/regress/regress33235_16_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_16_runtime_test.dart
rename to tests/language_2/regress/regress33235_16_runtime_test.dart
diff --git a/tests/language_2/regress_33235_16_test.dart b/tests/language_2/regress/regress33235_16_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_16_test.dart
rename to tests/language_2/regress/regress33235_16_test.dart
diff --git a/tests/language_2/regress_33235_17_test.dart b/tests/language_2/regress/regress33235_17_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_17_test.dart
rename to tests/language_2/regress/regress33235_17_test.dart
diff --git a/tests/language_2/regress_33235_18_test.dart b/tests/language_2/regress/regress33235_18_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_18_test.dart
rename to tests/language_2/regress/regress33235_18_test.dart
diff --git a/tests/language_2/regress_33235_19_test.dart b/tests/language_2/regress/regress33235_19_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_19_test.dart
rename to tests/language_2/regress/regress33235_19_test.dart
diff --git a/tests/language_2/regress_33235_20_test.dart b/tests/language_2/regress/regress33235_20_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_20_test.dart
rename to tests/language_2/regress/regress33235_20_test.dart
diff --git a/tests/language_2/regress_33235_21_test.dart b/tests/language_2/regress/regress33235_21_test.dart
similarity index 100%
rename from tests/language_2/regress_33235_21_test.dart
rename to tests/language_2/regress/regress33235_21_test.dart
diff --git a/tests/language_2/regress_33392_test.dart b/tests/language_2/regress/regress33392_test.dart
similarity index 100%
rename from tests/language_2/regress_33392_test.dart
rename to tests/language_2/regress/regress33392_test.dart
diff --git a/tests/language_2/regress_33479_runtime_test.dart b/tests/language_2/regress/regress33479_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_33479_runtime_test.dart
rename to tests/language_2/regress/regress33479_runtime_test.dart
diff --git a/tests/language_2/regress_33479_test.dart b/tests/language_2/regress/regress33479_test.dart
similarity index 100%
rename from tests/language_2/regress_33479_test.dart
rename to tests/language_2/regress/regress33479_test.dart
diff --git a/tests/language_2/regress_34034_test.dart b/tests/language_2/regress/regress34034_test.dart
similarity index 100%
rename from tests/language_2/regress_34034_test.dart
rename to tests/language_2/regress/regress34034_test.dart
diff --git a/tests/language_2/issue_34091.dart b/tests/language_2/regress/regress34091.dart
similarity index 100%
rename from tests/language_2/issue_34091.dart
rename to tests/language_2/regress/regress34091.dart
diff --git a/tests/language_2/issue34147_test.dart b/tests/language_2/regress/regress34147_test.dart
similarity index 100%
rename from tests/language_2/issue34147_test.dart
rename to tests/language_2/regress/regress34147_test.dart
diff --git a/tests/language_2/regress_34225_test.dart b/tests/language_2/regress/regress34225_test.dart
similarity index 100%
rename from tests/language_2/regress_34225_test.dart
rename to tests/language_2/regress/regress34225_test.dart
diff --git a/tests/language_2/bug34235_runtime_test.dart b/tests/language_2/regress/regress34235_runtime_test.dart
similarity index 100%
rename from tests/language_2/bug34235_runtime_test.dart
rename to tests/language_2/regress/regress34235_runtime_test.dart
diff --git a/tests/language_2/bug34235_test.dart b/tests/language_2/regress/regress34235_test.dart
similarity index 100%
rename from tests/language_2/bug34235_test.dart
rename to tests/language_2/regress/regress34235_test.dart
diff --git a/tests/language_2/regress_34392_test.dart b/tests/language_2/regress/regress34392_test.dart
similarity index 100%
rename from tests/language_2/regress_34392_test.dart
rename to tests/language_2/regress/regress34392_test.dart
diff --git a/tests/language_2/issue34404_flutter_modified_test.dart b/tests/language_2/regress/regress34404_flutter_modified_test.dart
similarity index 100%
rename from tests/language_2/issue34404_flutter_modified_test.dart
rename to tests/language_2/regress/regress34404_flutter_modified_test.dart
diff --git a/tests/language_2/issue34404_flutter_test.dart b/tests/language_2/regress/regress34404_flutter_test.dart
similarity index 100%
rename from tests/language_2/issue34404_flutter_test.dart
rename to tests/language_2/regress/regress34404_flutter_test.dart
diff --git a/tests/language_2/regress_34482_test.dart b/tests/language_2/regress/regress34482_test.dart
similarity index 100%
rename from tests/language_2/regress_34482_test.dart
rename to tests/language_2/regress/regress34482_test.dart
diff --git a/tests/language_2/issue34488_runtime_test.dart b/tests/language_2/regress/regress34488_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue34488_runtime_test.dart
rename to tests/language_2/regress/regress34488_runtime_test.dart
diff --git a/tests/language_2/issue34488_test.dart b/tests/language_2/regress/regress34488_test.dart
similarity index 100%
rename from tests/language_2/issue34488_test.dart
rename to tests/language_2/regress/regress34488_test.dart
diff --git a/tests/language_2/issue34489_runtime_test.dart b/tests/language_2/regress/regress34489_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue34489_runtime_test.dart
rename to tests/language_2/regress/regress34489_runtime_test.dart
diff --git a/tests/language_2/issue34489_test.dart b/tests/language_2/regress/regress34489_test.dart
similarity index 100%
rename from tests/language_2/issue34489_test.dart
rename to tests/language_2/regress/regress34489_test.dart
diff --git a/tests/language_2/issue34495_runtime_test.dart b/tests/language_2/regress/regress34495_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue34495_runtime_test.dart
rename to tests/language_2/regress/regress34495_runtime_test.dart
diff --git a/tests/language_2/issue34495_test.dart b/tests/language_2/regress/regress34495_test.dart
similarity index 100%
rename from tests/language_2/issue34495_test.dart
rename to tests/language_2/regress/regress34495_test.dart
diff --git a/tests/language_2/issue34498_test.dart b/tests/language_2/regress/regress34498_test.dart
similarity index 100%
rename from tests/language_2/issue34498_test.dart
rename to tests/language_2/regress/regress34498_test.dart
diff --git a/tests/language_2/issue34514_test.dart b/tests/language_2/regress/regress34514_test.dart
similarity index 100%
rename from tests/language_2/issue34514_test.dart
rename to tests/language_2/regress/regress34514_test.dart
diff --git a/tests/language_2/issue34532_test.dart b/tests/language_2/regress/regress34532_test.dart
similarity index 100%
rename from tests/language_2/issue34532_test.dart
rename to tests/language_2/regress/regress34532_test.dart
diff --git a/tests/language_2/issue34635_test.dart b/tests/language_2/regress/regress34635_test.dart
similarity index 100%
rename from tests/language_2/issue34635_test.dart
rename to tests/language_2/regress/regress34635_test.dart
diff --git a/tests/language_2/issue34636_test.dart b/tests/language_2/regress/regress34636_test.dart
similarity index 100%
rename from tests/language_2/issue34636_test.dart
rename to tests/language_2/regress/regress34636_test.dart
diff --git a/tests/language_2/issue34870_test.dart b/tests/language_2/regress/regress34870_test.dart
similarity index 100%
rename from tests/language_2/issue34870_test.dart
rename to tests/language_2/regress/regress34870_test.dart
diff --git a/tests/language_2/issue34877_test.dart b/tests/language_2/regress/regress34877_test.dart
similarity index 100%
rename from tests/language_2/issue34877_test.dart
rename to tests/language_2/regress/regress34877_test.dart
diff --git a/tests/language_2/issue34896_test.dart b/tests/language_2/regress/regress34896_test.dart
similarity index 100%
rename from tests/language_2/issue34896_test.dart
rename to tests/language_2/regress/regress34896_test.dart
diff --git a/tests/language_2/issue34907_test.dart b/tests/language_2/regress/regress34907_test.dart
similarity index 100%
rename from tests/language_2/issue34907_test.dart
rename to tests/language_2/regress/regress34907_test.dart
diff --git a/tests/language_2/issue35043_runtime_test.dart b/tests/language_2/regress/regress35043_runtime_test.dart
similarity index 100%
rename from tests/language_2/issue35043_runtime_test.dart
rename to tests/language_2/regress/regress35043_runtime_test.dart
diff --git a/tests/language_2/issue35043_test.dart b/tests/language_2/regress/regress35043_test.dart
similarity index 100%
rename from tests/language_2/issue35043_test.dart
rename to tests/language_2/regress/regress35043_test.dart
diff --git a/tests/language_2/issue35090_test.dart b/tests/language_2/regress/regress35090_test.dart
similarity index 100%
rename from tests/language_2/issue35090_test.dart
rename to tests/language_2/regress/regress35090_test.dart
diff --git a/tests/language_2/regress_35258_runtime_test.dart b/tests/language_2/regress/regress35258_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_35258_runtime_test.dart
rename to tests/language_2/regress/regress35258_runtime_test.dart
diff --git a/tests/language_2/regress_35258_test.dart b/tests/language_2/regress/regress35258_test.dart
similarity index 100%
rename from tests/language_2/regress_35258_test.dart
rename to tests/language_2/regress/regress35258_test.dart
diff --git a/tests/language_2/regress_35259_runtime_test.dart b/tests/language_2/regress/regress35259_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_35259_runtime_test.dart
rename to tests/language_2/regress/regress35259_runtime_test.dart
diff --git a/tests/language_2/regress_35259_test.dart b/tests/language_2/regress/regress35259_test.dart
similarity index 100%
rename from tests/language_2/regress_35259_test.dart
rename to tests/language_2/regress/regress35259_test.dart
diff --git a/tests/language_2/regress_35260_runtime_test.dart b/tests/language_2/regress/regress35260_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_35260_runtime_test.dart
rename to tests/language_2/regress/regress35260_runtime_test.dart
diff --git a/tests/language_2/regress_35260_test.dart b/tests/language_2/regress/regress35260_test.dart
similarity index 100%
rename from tests/language_2/regress_35260_test.dart
rename to tests/language_2/regress/regress35260_test.dart
diff --git a/tests/language_2/regress_35266_runtime_test.dart b/tests/language_2/regress/regress35266_runtime_test.dart
similarity index 100%
rename from tests/language_2/regress_35266_runtime_test.dart
rename to tests/language_2/regress/regress35266_runtime_test.dart
diff --git a/tests/language_2/regress_35266_test.dart b/tests/language_2/regress/regress35266_test.dart
similarity index 100%
rename from tests/language_2/regress_35266_test.dart
rename to tests/language_2/regress/regress35266_test.dart
diff --git a/tests/language_2/regress_35542_test.dart b/tests/language_2/regress/regress35542_test.dart
similarity index 100%
rename from tests/language_2/regress_35542_test.dart
rename to tests/language_2/regress/regress35542_test.dart
diff --git a/tests/language_2/regress_36084_test.dart b/tests/language_2/regress/regress36084_test.dart
similarity index 100%
rename from tests/language_2/regress_36084_test.dart
rename to tests/language_2/regress/regress36084_test.dart
diff --git a/tests/language_2/issue3806_test.dart b/tests/language_2/regress/regress3806_test.dart
similarity index 100%
rename from tests/language_2/issue3806_test.dart
rename to tests/language_2/regress/regress3806_test.dart
diff --git a/tests/language_2/issue38816_test.dart b/tests/language_2/regress/regress38816_test.dart
similarity index 100%
rename from tests/language_2/issue38816_test.dart
rename to tests/language_2/regress/regress38816_test.dart
diff --git a/tests/language_2/issue4157508_test.dart b/tests/language_2/regress/regress4157508_test.dart
similarity index 100%
rename from tests/language_2/issue4157508_test.dart
rename to tests/language_2/regress/regress4157508_test.dart
diff --git a/tests/language_2/issue4295001_test.dart b/tests/language_2/regress/regress4295001_test.dart
similarity index 100%
rename from tests/language_2/issue4295001_test.dart
rename to tests/language_2/regress/regress4295001_test.dart
diff --git a/tests/language_2/issue4515170_test.dart b/tests/language_2/regress/regress4515170_test.dart
similarity index 100%
rename from tests/language_2/issue4515170_test.dart
rename to tests/language_2/regress/regress4515170_test.dart
diff --git a/tests/language_2/crash_6725_part.dart b/tests/language_2/regress/regress6725_part.dart
similarity index 100%
rename from tests/language_2/crash_6725_part.dart
rename to tests/language_2/regress/regress6725_part.dart
diff --git a/tests/language_2/crash_6725_runtime_test.dart b/tests/language_2/regress/regress6725_runtime_test.dart
similarity index 100%
rename from tests/language_2/crash_6725_runtime_test.dart
rename to tests/language_2/regress/regress6725_runtime_test.dart
diff --git a/tests/language_2/crash_6725_test.dart b/tests/language_2/regress/regress6725_test.dart
similarity index 84%
rename from tests/language_2/crash_6725_test.dart
rename to tests/language_2/regress/regress6725_test.dart
index 521bf33f47a..96df166047b 100644
--- a/tests/language_2/crash_6725_test.dart
+++ b/tests/language_2/regress/regress6725_test.dart
@@ -6,7 +6,7 @@
 
 library crash_6725;
 
-part 'crash_6725_part.dart'; //# 01: compile-time error
+part 'regress6725_part.dart'; //# 01: compile-time error
 
 main() {
   test(); //# 01: continued
diff --git a/tests/language_2/issue7513_test.dart b/tests/language_2/regress/regress7513_test.dart
similarity index 100%
rename from tests/language_2/issue7513_test.dart
rename to tests/language_2/regress/regress7513_test.dart
diff --git a/tests/language_2/issue7525_test.dart b/tests/language_2/regress/regress7525_test.dart
similarity index 100%
rename from tests/language_2/issue7525_test.dart
rename to tests/language_2/regress/regress7525_test.dart
diff --git a/tests/language_2/issue9602_other.dart b/tests/language_2/regress/regress9602_other.dart
similarity index 100%
rename from tests/language_2/issue9602_other.dart
rename to tests/language_2/regress/regress9602_other.dart
diff --git a/tests/language_2/issue9602_test.dart b/tests/language_2/regress/regress9602_test.dart
similarity index 91%
rename from tests/language_2/issue9602_test.dart
rename to tests/language_2/regress/regress9602_test.dart
index 93d988b1cb5..8900388303c 100644
--- a/tests/language_2/issue9602_test.dart
+++ b/tests/language_2/regress/regress9602_test.dart
@@ -5,7 +5,7 @@
 // Regression test case for http://dartbug.com/9602
 library issue9602;
 
-import 'issue9602_other.dart';
+import 'regress9602_other.dart';
 
 class C extends Object with M {}
 
diff --git a/tests/language_2/issue9664_test.dart b/tests/language_2/regress/regress9664_test.dart
similarity index 100%
rename from tests/language_2/issue9664_test.dart
rename to tests/language_2/regress/regress9664_test.dart
diff --git a/tests/language_2/issue9687_test.dart b/tests/language_2/regress/regress9687_test.dart
similarity index 100%
rename from tests/language_2/issue9687_test.dart
rename to tests/language_2/regress/regress9687_test.dart
diff --git a/tests/language_2/issue9939_test.dart b/tests/language_2/regress/regress9939_test.dart
similarity index 100%
rename from tests/language_2/issue9939_test.dart
rename to tests/language_2/regress/regress9939_test.dart
diff --git a/tests/language_2/issue9949_test.dart b/tests/language_2/regress/regress9949_test.dart
similarity index 100%
rename from tests/language_2/issue9949_test.dart
rename to tests/language_2/regress/regress9949_test.dart
diff --git a/tests/language_2/resolution_test.dart b/tests/language_2/resolution/resolution_test.dart
similarity index 100%
rename from tests/language_2/resolution_test.dart
rename to tests/language_2/resolution/resolution_test.dart
diff --git a/tests/language_2/resolve_test.dart b/tests/language_2/resolution/resolve_test.dart
similarity index 100%
rename from tests/language_2/resolve_test.dart
rename to tests/language_2/resolution/resolve_test.dart
diff --git a/tests/language_2/unqual_name_test.dart b/tests/language_2/resolution/unqual_name_test.dart
similarity index 100%
rename from tests/language_2/unqual_name_test.dart
rename to tests/language_2/resolution/unqual_name_test.dart
diff --git a/tests/language_2/return_in_loop_test.dart b/tests/language_2/return/in_loop_test.dart
similarity index 100%
rename from tests/language_2/return_in_loop_test.dart
rename to tests/language_2/return/in_loop_test.dart
diff --git a/tests/language_2/skip_expression_test.dart b/tests/language_2/return/skip_expression_test.dart
similarity index 100%
rename from tests/language_2/skip_expression_test.dart
rename to tests/language_2/return/skip_expression_test.dart
diff --git a/tests/language_2/return_this_type_test.dart b/tests/language_2/return/this_type_test.dart
similarity index 100%
rename from tests/language_2/return_this_type_test.dart
rename to tests/language_2/return/this_type_test.dart
diff --git a/tests/language_2/return_type_test.dart b/tests/language_2/return/type_test.dart
similarity index 100%
rename from tests/language_2/return_type_test.dart
rename to tests/language_2/return/type_test.dart
diff --git a/tests/language_2/rewrite_assign_test.dart b/tests/language_2/rewrite/assign_test.dart
similarity index 100%
rename from tests/language_2/rewrite_assign_test.dart
rename to tests/language_2/rewrite/assign_test.dart
diff --git a/tests/language_2/rewrite_compound_assign_test.dart b/tests/language_2/rewrite/compound_assign_test.dart
similarity index 100%
rename from tests/language_2/rewrite_compound_assign_test.dart
rename to tests/language_2/rewrite/compound_assign_test.dart
diff --git a/tests/language_2/rewrite_conditional_test.dart b/tests/language_2/rewrite/conditional_test.dart
similarity index 100%
rename from tests/language_2/rewrite_conditional_test.dart
rename to tests/language_2/rewrite/conditional_test.dart
diff --git a/tests/language_2/rewrite_for_update_order_test.dart b/tests/language_2/rewrite/for_update_order_test.dart
similarity index 100%
rename from tests/language_2/rewrite_for_update_order_test.dart
rename to tests/language_2/rewrite/for_update_order_test.dart
diff --git a/tests/language_2/rewrite_if_empty_then_test.dart b/tests/language_2/rewrite/if_empty_then_test.dart
similarity index 100%
rename from tests/language_2/rewrite_if_empty_then_test.dart
rename to tests/language_2/rewrite/if_empty_then_test.dart
diff --git a/tests/language_2/rewrite_if_return_test.dart b/tests/language_2/rewrite/if_return_test.dart
similarity index 100%
rename from tests/language_2/rewrite_if_return_test.dart
rename to tests/language_2/rewrite/if_return_test.dart
diff --git a/tests/language_2/rewrite_if_swap_test.dart b/tests/language_2/rewrite/if_swap_test.dart
similarity index 100%
rename from tests/language_2/rewrite_if_swap_test.dart
rename to tests/language_2/rewrite/if_swap_test.dart
diff --git a/tests/language_2/rewrite_implicit_this_runtime_test.dart b/tests/language_2/rewrite/implicit_this_runtime_test.dart
similarity index 100%
rename from tests/language_2/rewrite_implicit_this_runtime_test.dart
rename to tests/language_2/rewrite/implicit_this_runtime_test.dart
diff --git a/tests/language_2/rewrite_implicit_this_test.dart b/tests/language_2/rewrite/implicit_this_test.dart
similarity index 100%
rename from tests/language_2/rewrite_implicit_this_test.dart
rename to tests/language_2/rewrite/implicit_this_test.dart
diff --git a/tests/language_2/rewrite_logical_test.dart b/tests/language_2/rewrite/logical_test.dart
similarity index 100%
rename from tests/language_2/rewrite_logical_test.dart
rename to tests/language_2/rewrite/logical_test.dart
diff --git a/tests/language_2/rewrite_nested_if1_test.dart b/tests/language_2/rewrite/nested_if1_test.dart
similarity index 100%
rename from tests/language_2/rewrite_nested_if1_test.dart
rename to tests/language_2/rewrite/nested_if1_test.dart
diff --git a/tests/language_2/rewrite_nested_if2_test.dart b/tests/language_2/rewrite/nested_if2_test.dart
similarity index 100%
rename from tests/language_2/rewrite_nested_if2_test.dart
rename to tests/language_2/rewrite/nested_if2_test.dart
diff --git a/tests/language_2/rewrite_nested_if3_test.dart b/tests/language_2/rewrite/nested_if3_test.dart
similarity index 100%
rename from tests/language_2/rewrite_nested_if3_test.dart
rename to tests/language_2/rewrite/nested_if3_test.dart
diff --git a/tests/language_2/rewrite_swap_test.dart b/tests/language_2/rewrite/swap_test.dart
similarity index 100%
rename from tests/language_2/rewrite_swap_test.dart
rename to tests/language_2/rewrite/swap_test.dart
diff --git a/tests/language_2/rewrite_variable_initializer_test.dart b/tests/language_2/rewrite/variable_initializer_test.dart
similarity index 100%
rename from tests/language_2/rewrite_variable_initializer_test.dart
rename to tests/language_2/rewrite/variable_initializer_test.dart
diff --git a/tests/language_2/rewrite_while_many_exits_test.dart b/tests/language_2/rewrite/while_many_exits_test.dart
similarity index 100%
rename from tests/language_2/rewrite_while_many_exits_test.dart
rename to tests/language_2/rewrite/while_many_exits_test.dart
diff --git a/tests/language_2/rewrite_while_test.dart b/tests/language_2/rewrite/while_test.dart
similarity index 100%
rename from tests/language_2/rewrite_while_test.dart
rename to tests/language_2/rewrite/while_test.dart
diff --git a/tests/language_2/script_lib.dart b/tests/language_2/script/lib.dart
similarity index 100%
rename from tests/language_2/script_lib.dart
rename to tests/language_2/script/lib.dart
diff --git a/tests/language_2/script1_lib.dart b/tests/language_2/script/script1_lib.dart
similarity index 100%
rename from tests/language_2/script1_lib.dart
rename to tests/language_2/script/script1_lib.dart
diff --git a/tests/language_2/script1_part.dart b/tests/language_2/script/script1_part.dart
similarity index 100%
rename from tests/language_2/script1_part.dart
rename to tests/language_2/script/script1_part.dart
diff --git a/tests/language_2/script1_test.dart b/tests/language_2/script/script1_test.dart
similarity index 100%
rename from tests/language_2/script1_test.dart
rename to tests/language_2/script/script1_test.dart
diff --git a/tests/language_2/script2_part.dart b/tests/language_2/script/script2_part.dart
similarity index 91%
rename from tests/language_2/script2_part.dart
rename to tests/language_2/script/script2_part.dart
index 44f24e8963a..e48f121086f 100644
--- a/tests/language_2/script2_part.dart
+++ b/tests/language_2/script/script2_part.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 library Script2Part;
-import "script_lib.dart";
+import "lib.dart";
 
 part of "script2_test.dart";
 
diff --git a/tests/language_2/script2_test.dart b/tests/language_2/script/script2_test.dart
similarity index 100%
rename from tests/language_2/script2_test.dart
rename to tests/language_2/script/script2_test.dart
diff --git a/tests/language_2/script_source.dart b/tests/language_2/script/source.dart
similarity index 100%
rename from tests/language_2/script_source.dart
rename to tests/language_2/script/source.dart
diff --git a/tests/language_2/set_literals_in_annotations_test.dart b/tests/language_2/set_literals/in_annotations_test.dart
similarity index 100%
rename from tests/language_2/set_literals_in_annotations_test.dart
rename to tests/language_2/set_literals/in_annotations_test.dart
diff --git a/tests/language_2/set_literal_in_initializer_test.dart b/tests/language_2/set_literals/in_initializer_test.dart
similarity index 100%
rename from tests/language_2/set_literal_in_initializer_test.dart
rename to tests/language_2/set_literals/in_initializer_test.dart
diff --git a/tests/language_2/checked_setter2_test.dart b/tests/language_2/setter/checked2_test.dart
similarity index 100%
rename from tests/language_2/checked_setter2_test.dart
rename to tests/language_2/setter/checked2_test.dart
diff --git a/tests/language_2/checked_setter3_test.dart b/tests/language_2/setter/checked3_test.dart
similarity index 100%
rename from tests/language_2/checked_setter3_test.dart
rename to tests/language_2/setter/checked3_test.dart
diff --git a/tests/language_2/checked_setter_test.dart b/tests/language_2/setter/checked_setter_test.dart
similarity index 100%
rename from tests/language_2/checked_setter_test.dart
rename to tests/language_2/setter/checked_setter_test.dart
diff --git a/tests/language_2/setter_declaration_test.dart b/tests/language_2/setter/declaration_test.dart
similarity index 100%
rename from tests/language_2/setter_declaration_test.dart
rename to tests/language_2/setter/declaration_test.dart
diff --git a/tests/language_2/setter_no_getter_call_runtime_test.dart b/tests/language_2/setter/no_getter_call_runtime_test.dart
similarity index 100%
rename from tests/language_2/setter_no_getter_call_runtime_test.dart
rename to tests/language_2/setter/no_getter_call_runtime_test.dart
diff --git a/tests/language_2/setter_no_getter_call_test.dart b/tests/language_2/setter/no_getter_call_test.dart
similarity index 100%
rename from tests/language_2/setter_no_getter_call_test.dart
rename to tests/language_2/setter/no_getter_call_test.dart
diff --git a/tests/language_2/setter_no_getter_test.dart b/tests/language_2/setter/no_getter_test.dart
similarity index 100%
rename from tests/language_2/setter_no_getter_test.dart
rename to tests/language_2/setter/no_getter_test.dart
diff --git a/tests/language_2/setter_override2_test.dart b/tests/language_2/setter/override2_test.dart
similarity index 100%
rename from tests/language_2/setter_override2_test.dart
rename to tests/language_2/setter/override2_test.dart
diff --git a/tests/language_2/setter_override3_test.dart b/tests/language_2/setter/override3_test.dart
similarity index 100%
rename from tests/language_2/setter_override3_test.dart
rename to tests/language_2/setter/override3_test.dart
diff --git a/tests/language_2/setter_override_test.dart b/tests/language_2/setter/override_test.dart
similarity index 100%
rename from tests/language_2/setter_override_test.dart
rename to tests/language_2/setter/override_test.dart
diff --git a/tests/language_2/setter0_test.dart b/tests/language_2/setter/setter0_test.dart
similarity index 100%
rename from tests/language_2/setter0_test.dart
rename to tests/language_2/setter/setter0_test.dart
diff --git a/tests/language_2/setter1_test.dart b/tests/language_2/setter/setter1_test.dart
similarity index 100%
rename from tests/language_2/setter1_test.dart
rename to tests/language_2/setter/setter1_test.dart
diff --git a/tests/language_2/setter2_test.dart b/tests/language_2/setter/setter2_test.dart
similarity index 100%
rename from tests/language_2/setter2_test.dart
rename to tests/language_2/setter/setter2_test.dart
diff --git a/tests/language_2/setter3_runtime_test.dart b/tests/language_2/setter/setter3_runtime_test.dart
similarity index 100%
rename from tests/language_2/setter3_runtime_test.dart
rename to tests/language_2/setter/setter3_runtime_test.dart
diff --git a/tests/language_2/setter3_test.dart b/tests/language_2/setter/setter3_test.dart
similarity index 100%
rename from tests/language_2/setter3_test.dart
rename to tests/language_2/setter/setter3_test.dart
diff --git a/tests/language_2/setter4_test.dart b/tests/language_2/setter/setter4_test.dart
similarity index 100%
rename from tests/language_2/setter4_test.dart
rename to tests/language_2/setter/setter4_test.dart
diff --git a/tests/language_2/lazy_spread_test.dart b/tests/language_2/spread_collections/unevaluated_test.dart
similarity index 100%
rename from tests/language_2/lazy_spread_test.dart
rename to tests/language_2/spread_collections/unevaluated_test.dart
diff --git a/tests/language_2/custom_await_stack_trace_test.dart b/tests/language_2/stack_trace/custom_await_test.dart
similarity index 100%
rename from tests/language_2/custom_await_stack_trace_test.dart
rename to tests/language_2/stack_trace/custom_await_test.dart
diff --git a/tests/language_2/stacktrace_demangle_ctors_test.dart b/tests/language_2/stack_trace/demangle_ctors_test.dart
similarity index 100%
rename from tests/language_2/stacktrace_demangle_ctors_test.dart
rename to tests/language_2/stack_trace/demangle_ctors_test.dart
diff --git a/tests/language_2/error_stacktrace_runtime_test.dart b/tests/language_2/stack_trace/error_runtime_test.dart
similarity index 100%
rename from tests/language_2/error_stacktrace_runtime_test.dart
rename to tests/language_2/stack_trace/error_runtime_test.dart
diff --git a/tests/language_2/error_stacktrace_test.dart b/tests/language_2/stack_trace/error_test.dart
similarity index 100%
rename from tests/language_2/error_stacktrace_test.dart
rename to tests/language_2/stack_trace/error_test.dart
diff --git a/tests/language_2/full_stacktrace1_test.dart b/tests/language_2/stack_trace/full1_test.dart
similarity index 100%
rename from tests/language_2/full_stacktrace1_test.dart
rename to tests/language_2/stack_trace/full1_test.dart
diff --git a/tests/language_2/full_stacktrace2_test.dart b/tests/language_2/stack_trace/full2_test.dart
similarity index 100%
rename from tests/language_2/full_stacktrace2_test.dart
rename to tests/language_2/stack_trace/full2_test.dart
diff --git a/tests/language_2/full_stacktrace3_test.dart b/tests/language_2/stack_trace/full3_test.dart
similarity index 100%
rename from tests/language_2/full_stacktrace3_test.dart
rename to tests/language_2/stack_trace/full3_test.dart
diff --git a/tests/language_2/stacktrace_rethrow_error_test.dart b/tests/language_2/stack_trace/rethrow_error_test.dart
similarity index 100%
rename from tests/language_2/stacktrace_rethrow_error_test.dart
rename to tests/language_2/stack_trace/rethrow_error_test.dart
diff --git a/tests/language_2/stacktrace_rethrow_nonerror_test.dart b/tests/language_2/stack_trace/rethrow_nonerror_test.dart
similarity index 100%
rename from tests/language_2/stacktrace_rethrow_nonerror_test.dart
rename to tests/language_2/stack_trace/rethrow_nonerror_test.dart
diff --git a/tests/language_2/stack_trace_test.dart b/tests/language_2/stack_trace/stack_trace_test.dart
similarity index 100%
rename from tests/language_2/stack_trace_test.dart
rename to tests/language_2/stack_trace/stack_trace_test.dart
diff --git a/tests/language_2/stacktrace_test.dart b/tests/language_2/stack_trace/stacktrace_test.dart
similarity index 100%
rename from tests/language_2/stacktrace_test.dart
rename to tests/language_2/stack_trace/stacktrace_test.dart
diff --git a/tests/language_2/static_call_wrong_argument_count_test.dart b/tests/language_2/static/call_wrong_argument_count_test.dart
similarity index 100%
rename from tests/language_2/static_call_wrong_argument_count_test.dart
rename to tests/language_2/static/call_wrong_argument_count_test.dart
diff --git a/tests/language_2/static_closure_identical_test.dart b/tests/language_2/static/closure_identical_test.dart
similarity index 100%
rename from tests/language_2/static_closure_identical_test.dart
rename to tests/language_2/static/closure_identical_test.dart
diff --git a/tests/language_2/static_const_field_reserved_name_test.dart b/tests/language_2/static/const_field_reserved_name_test.dart
similarity index 100%
rename from tests/language_2/static_const_field_reserved_name_test.dart
rename to tests/language_2/static/const_field_reserved_name_test.dart
diff --git a/tests/language_2/static_const_field_test.dart b/tests/language_2/static/const_field_test.dart
similarity index 100%
rename from tests/language_2/static_const_field_test.dart
rename to tests/language_2/static/const_field_test.dart
diff --git a/tests/language_2/static_field1_runtime_test.dart b/tests/language_2/static/field1_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_field1_runtime_test.dart
rename to tests/language_2/static/field1_runtime_test.dart
diff --git a/tests/language_2/static_field1_test.dart b/tests/language_2/static/field1_test.dart
similarity index 100%
rename from tests/language_2/static_field1_test.dart
rename to tests/language_2/static/field1_test.dart
diff --git a/tests/language_2/static_field1a_runtime_test.dart b/tests/language_2/static/field1a_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_field1a_runtime_test.dart
rename to tests/language_2/static/field1a_runtime_test.dart
diff --git a/tests/language_2/static_field1a_test.dart b/tests/language_2/static/field1a_test.dart
similarity index 100%
rename from tests/language_2/static_field1a_test.dart
rename to tests/language_2/static/field1a_test.dart
diff --git a/tests/language_2/static_field3_runtime_test.dart b/tests/language_2/static/field3_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_field3_runtime_test.dart
rename to tests/language_2/static/field3_runtime_test.dart
diff --git a/tests/language_2/static_field3_test.dart b/tests/language_2/static/field3_test.dart
similarity index 100%
rename from tests/language_2/static_field3_test.dart
rename to tests/language_2/static/field3_test.dart
diff --git a/tests/language_2/static_field_override1_test.dart b/tests/language_2/static/field_override1_test.dart
similarity index 100%
rename from tests/language_2/static_field_override1_test.dart
rename to tests/language_2/static/field_override1_test.dart
diff --git a/tests/language_2/static_field_override2_test.dart b/tests/language_2/static/field_override2_test.dart
similarity index 100%
rename from tests/language_2/static_field_override2_test.dart
rename to tests/language_2/static/field_override2_test.dart
diff --git a/tests/language_2/static_field_override3_test.dart b/tests/language_2/static/field_override3_test.dart
similarity index 100%
rename from tests/language_2/static_field_override3_test.dart
rename to tests/language_2/static/field_override3_test.dart
diff --git a/tests/language_2/static_field_test.dart b/tests/language_2/static/field_test.dart
similarity index 100%
rename from tests/language_2/static_field_test.dart
rename to tests/language_2/static/field_test.dart
diff --git a/tests/language_2/static_final_field2_runtime_test.dart b/tests/language_2/static/final_field2_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_final_field2_runtime_test.dart
rename to tests/language_2/static/final_field2_runtime_test.dart
diff --git a/tests/language_2/static_final_field2_test.dart b/tests/language_2/static/final_field2_test.dart
similarity index 100%
rename from tests/language_2/static_final_field2_test.dart
rename to tests/language_2/static/final_field2_test.dart
diff --git a/tests/language_2/static_getter_no_setter1_runtime_test.dart b/tests/language_2/static/getter_no_setter1_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_getter_no_setter1_runtime_test.dart
rename to tests/language_2/static/getter_no_setter1_runtime_test.dart
diff --git a/tests/language_2/static_getter_no_setter1_test.dart b/tests/language_2/static/getter_no_setter1_test.dart
similarity index 100%
rename from tests/language_2/static_getter_no_setter1_test.dart
rename to tests/language_2/static/getter_no_setter1_test.dart
diff --git a/tests/language_2/static_getter_no_setter2_runtime_test.dart b/tests/language_2/static/getter_no_setter2_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_getter_no_setter2_runtime_test.dart
rename to tests/language_2/static/getter_no_setter2_runtime_test.dart
diff --git a/tests/language_2/static_getter_no_setter2_test.dart b/tests/language_2/static/getter_no_setter2_test.dart
similarity index 100%
rename from tests/language_2/static_getter_no_setter2_test.dart
rename to tests/language_2/static/getter_no_setter2_test.dart
diff --git a/tests/language_2/static_implicit_closure_test.dart b/tests/language_2/static/implicit_closure_test.dart
similarity index 100%
rename from tests/language_2/static_implicit_closure_test.dart
rename to tests/language_2/static/implicit_closure_test.dart
diff --git a/tests/language_2/static_initializer_type_error_test.dart b/tests/language_2/static/initializer_type_error_test.dart
similarity index 100%
rename from tests/language_2/static_initializer_type_error_test.dart
rename to tests/language_2/static/initializer_type_error_test.dart
diff --git a/tests/language_2/static_inline_test.dart b/tests/language_2/static/inline_test.dart
similarity index 100%
rename from tests/language_2/static_inline_test.dart
rename to tests/language_2/static/inline_test.dart
diff --git a/tests/language_2/static_parameter_test.dart b/tests/language_2/static/parameter_test.dart
similarity index 100%
rename from tests/language_2/static_parameter_test.dart
rename to tests/language_2/static/parameter_test.dart
diff --git a/tests/language_2/static_postfix_operator_test.dart b/tests/language_2/static/postfix_operator_test.dart
similarity index 100%
rename from tests/language_2/static_postfix_operator_test.dart
rename to tests/language_2/static/postfix_operator_test.dart
diff --git a/tests/language_2/static_setter_conflicts_test.dart b/tests/language_2/static/setter_conflicts_test.dart
similarity index 100%
rename from tests/language_2/static_setter_conflicts_test.dart
rename to tests/language_2/static/setter_conflicts_test.dart
diff --git a/tests/language_2/static_setter_get_runtime_test.dart b/tests/language_2/static/setter_get_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_setter_get_runtime_test.dart
rename to tests/language_2/static/setter_get_runtime_test.dart
diff --git a/tests/language_2/static_setter_get_test.dart b/tests/language_2/static/setter_get_test.dart
similarity index 100%
rename from tests/language_2/static_setter_get_test.dart
rename to tests/language_2/static/setter_get_test.dart
diff --git a/tests/language_2/static_top_level_runtime_test.dart b/tests/language_2/static/top_level_runtime_test.dart
similarity index 100%
rename from tests/language_2/static_top_level_runtime_test.dart
rename to tests/language_2/static/top_level_runtime_test.dart
diff --git a/tests/language_2/static_top_level_test.dart b/tests/language_2/static/top_level_test.dart
similarity index 100%
rename from tests/language_2/static_top_level_test.dart
rename to tests/language_2/static/top_level_test.dart
diff --git a/tests/language_2/adjacent_const_string_literals_test.dart b/tests/language_2/string/adjacent_const_string_literals_test.dart
similarity index 100%
rename from tests/language_2/adjacent_const_string_literals_test.dart
rename to tests/language_2/string/adjacent_const_string_literals_test.dart
diff --git a/tests/language_2/adjacent_string_literals_test.dart b/tests/language_2/string/adjacent_string_literals_test.dart
similarity index 100%
rename from tests/language_2/adjacent_string_literals_test.dart
rename to tests/language_2/string/adjacent_string_literals_test.dart
diff --git a/tests/language_2/bad_raw_string_runtime_test.dart b/tests/language_2/string/bad_raw_string_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_raw_string_runtime_test.dart
rename to tests/language_2/string/bad_raw_string_runtime_test.dart
diff --git a/tests/language_2/bad_raw_string_test.dart b/tests/language_2/string/bad_raw_string_test.dart
similarity index 100%
rename from tests/language_2/bad_raw_string_test.dart
rename to tests/language_2/string/bad_raw_string_test.dart
diff --git a/tests/language_2/char_escape_test.dart b/tests/language_2/string/char_escape_test.dart
similarity index 100%
rename from tests/language_2/char_escape_test.dart
rename to tests/language_2/string/char_escape_test.dart
diff --git a/tests/language_2/string_charcode_test.dart b/tests/language_2/string/charcode_test.dart
similarity index 100%
rename from tests/language_2/string_charcode_test.dart
rename to tests/language_2/string/charcode_test.dart
diff --git a/tests/language_2/constant_string_interpolation2_test.dart b/tests/language_2/string/const_interpolation2_test.dart
similarity index 100%
rename from tests/language_2/constant_string_interpolation2_test.dart
rename to tests/language_2/string/const_interpolation2_test.dart
diff --git a/tests/language_2/constant_string_interpolation_test.dart b/tests/language_2/string/const_interpolation_constant_string_interpolation_test.dart
similarity index 100%
rename from tests/language_2/constant_string_interpolation_test.dart
rename to tests/language_2/string/const_interpolation_constant_string_interpolation_test.dart
diff --git a/tests/language_2/string_escape4_test.dart b/tests/language_2/string/escape4_test.dart
similarity index 100%
rename from tests/language_2/string_escape4_test.dart
rename to tests/language_2/string/escape4_test.dart
diff --git a/tests/language_2/string_escapes_test.dart b/tests/language_2/string/escapes_test.dart
similarity index 100%
rename from tests/language_2/string_escapes_test.dart
rename to tests/language_2/string/escapes_test.dart
diff --git a/tests/language_2/string_interpolate1_test.dart b/tests/language_2/string/interpolate1_test.dart
similarity index 100%
rename from tests/language_2/string_interpolate1_test.dart
rename to tests/language_2/string/interpolate1_test.dart
diff --git a/tests/language_2/string_interpolate2_test.dart b/tests/language_2/string/interpolate2_test.dart
similarity index 100%
rename from tests/language_2/string_interpolate2_test.dart
rename to tests/language_2/string/interpolate2_test.dart
diff --git a/tests/language_2/string_interpolate3_test.dart b/tests/language_2/string/interpolate3_test.dart
similarity index 100%
rename from tests/language_2/string_interpolate3_test.dart
rename to tests/language_2/string/interpolate3_test.dart
diff --git a/tests/language_2/string_interpolate_null_test.dart b/tests/language_2/string/interpolate_null_test.dart
similarity index 100%
rename from tests/language_2/string_interpolate_null_test.dart
rename to tests/language_2/string/interpolate_null_test.dart
diff --git a/tests/language_2/string_interpolate_test.dart b/tests/language_2/string/interpolate_test.dart
similarity index 100%
rename from tests/language_2/string_interpolate_test.dart
rename to tests/language_2/string/interpolate_test.dart
diff --git a/tests/language_2/string_interpolation1_runtime_test.dart b/tests/language_2/string/interpolation1_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation1_runtime_test.dart
rename to tests/language_2/string/interpolation1_runtime_test.dart
diff --git a/tests/language_2/string_interpolation1_test.dart b/tests/language_2/string/interpolation1_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation1_test.dart
rename to tests/language_2/string/interpolation1_test.dart
diff --git a/tests/language_2/string_interpolation2_runtime_test.dart b/tests/language_2/string/interpolation2_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation2_runtime_test.dart
rename to tests/language_2/string/interpolation2_runtime_test.dart
diff --git a/tests/language_2/string_interpolation2_test.dart b/tests/language_2/string/interpolation2_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation2_test.dart
rename to tests/language_2/string/interpolation2_test.dart
diff --git a/tests/language_2/string_interpolation3_runtime_test.dart b/tests/language_2/string/interpolation3_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation3_runtime_test.dart
rename to tests/language_2/string/interpolation3_runtime_test.dart
diff --git a/tests/language_2/string_interpolation3_test.dart b/tests/language_2/string/interpolation3_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation3_test.dart
rename to tests/language_2/string/interpolation3_test.dart
diff --git a/tests/language_2/string_interpolation4_runtime_test.dart b/tests/language_2/string/interpolation4_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation4_runtime_test.dart
rename to tests/language_2/string/interpolation4_runtime_test.dart
diff --git a/tests/language_2/string_interpolation4_test.dart b/tests/language_2/string/interpolation4_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation4_test.dart
rename to tests/language_2/string/interpolation4_test.dart
diff --git a/tests/language_2/string_interpolation5_runtime_test.dart b/tests/language_2/string/interpolation5_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation5_runtime_test.dart
rename to tests/language_2/string/interpolation5_runtime_test.dart
diff --git a/tests/language_2/string_interpolation5_test.dart b/tests/language_2/string/interpolation5_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation5_test.dart
rename to tests/language_2/string/interpolation5_test.dart
diff --git a/tests/language_2/string_interpolation6_runtime_test.dart b/tests/language_2/string/interpolation6_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation6_runtime_test.dart
rename to tests/language_2/string/interpolation6_runtime_test.dart
diff --git a/tests/language_2/string_interpolation6_test.dart b/tests/language_2/string/interpolation6_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation6_test.dart
rename to tests/language_2/string/interpolation6_test.dart
diff --git a/tests/language_2/string_interpolation7_test.dart b/tests/language_2/string/interpolation7_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation7_test.dart
rename to tests/language_2/string/interpolation7_test.dart
diff --git a/tests/language_2/string_interpolation8_test.dart b/tests/language_2/string/interpolation8_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation8_test.dart
rename to tests/language_2/string/interpolation8_test.dart
diff --git a/tests/language_2/string_interpolation9_runtime_test.dart b/tests/language_2/string/interpolation9_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation9_runtime_test.dart
rename to tests/language_2/string/interpolation9_runtime_test.dart
diff --git a/tests/language_2/string_interpolation9_test.dart b/tests/language_2/string/interpolation9_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation9_test.dart
rename to tests/language_2/string/interpolation9_test.dart
diff --git a/tests/language_2/string_interpolation_and_buffer_test.dart b/tests/language_2/string/interpolation_and_buffer_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation_and_buffer_test.dart
rename to tests/language_2/string/interpolation_and_buffer_test.dart
diff --git a/tests/language_2/string_interpolation_newline_test.dart b/tests/language_2/string/interpolation_newline_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation_newline_test.dart
rename to tests/language_2/string/interpolation_newline_test.dart
diff --git a/tests/language_2/string_interpolation_runtime_test.dart b/tests/language_2/string/interpolation_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation_runtime_test.dart
rename to tests/language_2/string/interpolation_runtime_test.dart
diff --git a/tests/language_2/string_interpolation_test.dart b/tests/language_2/string/interpolation_test.dart
similarity index 100%
rename from tests/language_2/string_interpolation_test.dart
rename to tests/language_2/string/interpolation_test.dart
diff --git a/tests/language_2/string_intrinsics_test.dart b/tests/language_2/string/intrinsics_test.dart
similarity index 100%
rename from tests/language_2/string_intrinsics_test.dart
rename to tests/language_2/string/intrinsics_test.dart
diff --git a/tests/language_2/string_join_test.dart b/tests/language_2/string/join_test.dart
similarity index 100%
rename from tests/language_2/string_join_test.dart
rename to tests/language_2/string/join_test.dart
diff --git a/tests/language_2/string_literals_test.dart b/tests/language_2/string/literals_test.dart
similarity index 100%
rename from tests/language_2/string_literals_test.dart
rename to tests/language_2/string/literals_test.dart
diff --git a/tests/language_2/multiline_newline_cr.dart b/tests/language_2/string/multiline_newline_cr.dart
similarity index 100%
rename from tests/language_2/multiline_newline_cr.dart
rename to tests/language_2/string/multiline_newline_cr.dart
diff --git a/tests/language_2/multiline_newline_crlf.dart b/tests/language_2/string/multiline_newline_crlf.dart
similarity index 100%
rename from tests/language_2/multiline_newline_crlf.dart
rename to tests/language_2/string/multiline_newline_crlf.dart
diff --git a/tests/language_2/multiline_newline_lf.dart b/tests/language_2/string/multiline_newline_lf.dart
similarity index 100%
rename from tests/language_2/multiline_newline_lf.dart
rename to tests/language_2/string/multiline_newline_lf.dart
diff --git a/tests/language_2/multiline_newline_runtime_1_test.dart b/tests/language_2/string/multiline_newline_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_runtime_1_test.dart
rename to tests/language_2/string/multiline_newline_runtime_1_test.dart
diff --git a/tests/language_2/multiline_newline_runtime_2_test.dart b/tests/language_2/string/multiline_newline_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_runtime_2_test.dart
rename to tests/language_2/string/multiline_newline_runtime_2_test.dart
diff --git a/tests/language_2/multiline_newline_runtime_3_test.dart b/tests/language_2/string/multiline_newline_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_runtime_3_test.dart
rename to tests/language_2/string/multiline_newline_runtime_3_test.dart
diff --git a/tests/language_2/multiline_newline_runtime_4_test.dart b/tests/language_2/string/multiline_newline_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_runtime_4_test.dart
rename to tests/language_2/string/multiline_newline_runtime_4_test.dart
diff --git a/tests/language_2/multiline_newline_runtime_5_test.dart b/tests/language_2/string/multiline_newline_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_runtime_5_test.dart
rename to tests/language_2/string/multiline_newline_runtime_5_test.dart
diff --git a/tests/language_2/multiline_newline_runtime_6_test.dart b/tests/language_2/string/multiline_newline_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_runtime_6_test.dart
rename to tests/language_2/string/multiline_newline_runtime_6_test.dart
diff --git a/tests/language_2/multiline_newline_runtime_test.dart b/tests/language_2/string/multiline_newline_runtime_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_runtime_test.dart
rename to tests/language_2/string/multiline_newline_runtime_test.dart
diff --git a/tests/language_2/multiline_newline_test.dart b/tests/language_2/string/multiline_newline_test.dart
similarity index 100%
rename from tests/language_2/multiline_newline_test.dart
rename to tests/language_2/string/multiline_newline_test.dart
diff --git a/tests/language_2/multiline_strings_test.dart b/tests/language_2/string/multiline_strings_test.dart
similarity index 100%
rename from tests/language_2/multiline_strings_test.dart
rename to tests/language_2/string/multiline_strings_test.dart
diff --git a/tests/language_2/string_no_operator_runtime_test.dart b/tests/language_2/string/no_operator_runtime_test.dart
similarity index 100%
rename from tests/language_2/string_no_operator_runtime_test.dart
rename to tests/language_2/string/no_operator_runtime_test.dart
diff --git a/tests/language_2/string_no_operator_test.dart b/tests/language_2/string/no_operator_test.dart
similarity index 100%
rename from tests/language_2/string_no_operator_test.dart
rename to tests/language_2/string/no_operator_test.dart
diff --git a/tests/language_2/string_optimizations_test.dart b/tests/language_2/string/optimizations_test.dart
similarity index 94%
rename from tests/language_2/string_optimizations_test.dart
rename to tests/language_2/string/optimizations_test.dart
index e4f7c95c2eb..a40bc0b51dc 100644
--- a/tests/language_2/string_optimizations_test.dart
+++ b/tests/language_2/string/optimizations_test.dart
@@ -6,7 +6,7 @@
 // correctly infer optional named parameters.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 @DontInline()
 foo({path}) {
diff --git a/tests/language_2/string_overflow.dart b/tests/language_2/string/overflow.dart
similarity index 100%
rename from tests/language_2/string_overflow.dart
rename to tests/language_2/string/overflow.dart
diff --git a/tests/language_2/raw_string_test.dart b/tests/language_2/string/raw_string_test.dart
similarity index 100%
rename from tests/language_2/raw_string_test.dart
rename to tests/language_2/string/raw_string_test.dart
diff --git a/tests/language_2/string_runtime_test.dart b/tests/language_2/string/runtime_test.dart
similarity index 100%
rename from tests/language_2/string_runtime_test.dart
rename to tests/language_2/string/runtime_test.dart
diff --git a/tests/language_2/string_split_test.dart b/tests/language_2/string/split_test.dart
similarity index 100%
rename from tests/language_2/string_split_test.dart
rename to tests/language_2/string/split_test.dart
diff --git a/tests/language_2/string_test.dart b/tests/language_2/string/string_test.dart
similarity index 100%
rename from tests/language_2/string_test.dart
rename to tests/language_2/string/string_test.dart
diff --git a/tests/language_2/substring_runtime_test.dart b/tests/language_2/string/substring_runtime_test.dart
similarity index 100%
rename from tests/language_2/substring_runtime_test.dart
rename to tests/language_2/string/substring_runtime_test.dart
diff --git a/tests/language_2/substring_test.dart b/tests/language_2/string/substring_test.dart
similarity index 100%
rename from tests/language_2/substring_test.dart
rename to tests/language_2/string/substring_test.dart
diff --git a/tests/language_2/string_supertype_checked_test.dart b/tests/language_2/string/supertype_checked_test.dart
similarity index 100%
rename from tests/language_2/string_supertype_checked_test.dart
rename to tests/language_2/string/supertype_checked_test.dart
diff --git a/tests/language_2/string_unicode1_test.dart b/tests/language_2/string/unicode1_test.dart
similarity index 100%
rename from tests/language_2/string_unicode1_test.dart
rename to tests/language_2/string/unicode1_test.dart
diff --git a/tests/language_2/string_unicode2_test.dart b/tests/language_2/string/unicode2_test.dart
similarity index 100%
rename from tests/language_2/string_unicode2_test.dart
rename to tests/language_2/string/unicode2_test.dart
diff --git a/tests/language_2/string_unicode3_test.dart b/tests/language_2/string/unicode3_test.dart
similarity index 100%
rename from tests/language_2/string_unicode3_test.dart
rename to tests/language_2/string/unicode3_test.dart
diff --git a/tests/language_2/string_unicode4_test.dart b/tests/language_2/string/unicode4_test.dart
similarity index 100%
rename from tests/language_2/string_unicode4_test.dart
rename to tests/language_2/string/unicode4_test.dart
diff --git a/tests/language_2/unicode_bom_middle_test.dart b/tests/language_2/string/unicode_bom_middle_test.dart
similarity index 100%
rename from tests/language_2/unicode_bom_middle_test.dart
rename to tests/language_2/string/unicode_bom_middle_test.dart
diff --git a/tests/language_2/unicode_bom_test.dart b/tests/language_2/string/unicode_bom_test.dart
similarity index 100%
rename from tests/language_2/unicode_bom_test.dart
rename to tests/language_2/string/unicode_bom_test.dart
diff --git a/tests/language_2/unicode_hash_test.dart b/tests/language_2/string/unicode_hash_test.dart
similarity index 100%
rename from tests/language_2/unicode_hash_test.dart
rename to tests/language_2/string/unicode_hash_test.dart
diff --git a/tests/language_2/super_abstract_method_test.dart b/tests/language_2/super/abstract_method_test.dart
similarity index 100%
rename from tests/language_2/super_abstract_method_test.dart
rename to tests/language_2/super/abstract_method_test.dart
diff --git a/tests/language_2/additional_interface_adds_optional_args_supercall_test.dart b/tests/language_2/super/additional_interface_adds_optional_args_supercall_test.dart
similarity index 100%
rename from tests/language_2/additional_interface_adds_optional_args_supercall_test.dart
rename to tests/language_2/super/additional_interface_adds_optional_args_supercall_test.dart
diff --git a/tests/language_2/super_all_named_constructor_test.dart b/tests/language_2/super/all_named_constructor_test.dart
similarity index 100%
rename from tests/language_2/super_all_named_constructor_test.dart
rename to tests/language_2/super/all_named_constructor_test.dart
diff --git a/tests/language_2/super_assign_runtime_test.dart b/tests/language_2/super/assign_runtime_test.dart
similarity index 100%
rename from tests/language_2/super_assign_runtime_test.dart
rename to tests/language_2/super/assign_runtime_test.dart
diff --git a/tests/language_2/super_assign_test.dart b/tests/language_2/super/assign_test.dart
similarity index 100%
rename from tests/language_2/super_assign_test.dart
rename to tests/language_2/super/assign_test.dart
diff --git a/tests/language_2/super_bound_closure_test.dart b/tests/language_2/super/bound_closure_test.dart
similarity index 100%
rename from tests/language_2/super_bound_closure_test.dart
rename to tests/language_2/super/bound_closure_test.dart
diff --git a/tests/language_2/super_call2_test.dart b/tests/language_2/super/call2_test.dart
similarity index 100%
rename from tests/language_2/super_call2_test.dart
rename to tests/language_2/super/call2_test.dart
diff --git a/tests/language_2/super_call3_runtime_test.dart b/tests/language_2/super/call3_runtime_test.dart
similarity index 100%
rename from tests/language_2/super_call3_runtime_test.dart
rename to tests/language_2/super/call3_runtime_test.dart
diff --git a/tests/language_2/super_call3_test.dart b/tests/language_2/super/call3_test.dart
similarity index 100%
rename from tests/language_2/super_call3_test.dart
rename to tests/language_2/super/call3_test.dart
diff --git a/tests/language_2/super_call4_test.dart b/tests/language_2/super/call4_test.dart
similarity index 100%
rename from tests/language_2/super_call4_test.dart
rename to tests/language_2/super/call4_test.dart
diff --git a/tests/language_2/super_call_test.dart b/tests/language_2/super/call_test.dart
similarity index 100%
rename from tests/language_2/super_call_test.dart
rename to tests/language_2/super/call_test.dart
diff --git a/tests/language_2/super_closure_test.dart b/tests/language_2/super/closure_test.dart
similarity index 100%
rename from tests/language_2/super_closure_test.dart
rename to tests/language_2/super/closure_test.dart
diff --git a/tests/language_2/super_conditional_operator_runtime_test.dart b/tests/language_2/super/conditional_operator_runtime_test.dart
similarity index 100%
rename from tests/language_2/super_conditional_operator_runtime_test.dart
rename to tests/language_2/super/conditional_operator_runtime_test.dart
diff --git a/tests/language_2/super_conditional_operator_test.dart b/tests/language_2/super/conditional_operator_test.dart
similarity index 100%
rename from tests/language_2/super_conditional_operator_test.dart
rename to tests/language_2/super/conditional_operator_test.dart
diff --git a/tests/language_2/super_field_2_test.dart b/tests/language_2/super/field_2_test.dart
similarity index 100%
rename from tests/language_2/super_field_2_test.dart
rename to tests/language_2/super/field_2_test.dart
diff --git a/tests/language_2/super_field_access_test.dart b/tests/language_2/super/field_access_test.dart
similarity index 100%
rename from tests/language_2/super_field_access_test.dart
rename to tests/language_2/super/field_access_test.dart
diff --git a/tests/language_2/super_field_test.dart b/tests/language_2/super/field_test.dart
similarity index 100%
rename from tests/language_2/super_field_test.dart
rename to tests/language_2/super/field_test.dart
diff --git a/tests/language_2/super_from_constructor_test.dart b/tests/language_2/super/from_constructor_test.dart
similarity index 100%
rename from tests/language_2/super_from_constructor_test.dart
rename to tests/language_2/super/from_constructor_test.dart
diff --git a/tests/language_2/super_implicit_closure_test.dart b/tests/language_2/super/implicit_closure_test.dart
similarity index 100%
rename from tests/language_2/super_implicit_closure_test.dart
rename to tests/language_2/super/implicit_closure_test.dart
diff --git a/tests/language_2/super_in_async1_test.dart b/tests/language_2/super/in_async1_test.dart
similarity index 100%
rename from tests/language_2/super_in_async1_test.dart
rename to tests/language_2/super/in_async1_test.dart
diff --git a/tests/language_2/super_in_async2_test.dart b/tests/language_2/super/in_async2_test.dart
similarity index 100%
rename from tests/language_2/super_in_async2_test.dart
rename to tests/language_2/super/in_async2_test.dart
diff --git a/tests/language_2/super_in_async3_test.dart b/tests/language_2/super/in_async3_test.dart
similarity index 100%
rename from tests/language_2/super_in_async3_test.dart
rename to tests/language_2/super/in_async3_test.dart
diff --git a/tests/language_2/super_in_async4_test.dart b/tests/language_2/super/in_async4_test.dart
similarity index 100%
rename from tests/language_2/super_in_async4_test.dart
rename to tests/language_2/super/in_async4_test.dart
diff --git a/tests/language_2/super_in_async5_test.dart b/tests/language_2/super/in_async5_test.dart
similarity index 100%
rename from tests/language_2/super_in_async5_test.dart
rename to tests/language_2/super/in_async5_test.dart
diff --git a/tests/language_2/super_in_async6_test.dart b/tests/language_2/super/in_async6_test.dart
similarity index 100%
rename from tests/language_2/super_in_async6_test.dart
rename to tests/language_2/super/in_async6_test.dart
diff --git a/tests/language_2/super_in_constructor_test.dart b/tests/language_2/super/in_constructor_test.dart
similarity index 100%
rename from tests/language_2/super_in_constructor_test.dart
rename to tests/language_2/super/in_constructor_test.dart
diff --git a/tests/language_2/super_in_finally_test.dart b/tests/language_2/super/in_finally_test.dart
similarity index 100%
rename from tests/language_2/super_in_finally_test.dart
rename to tests/language_2/super/in_finally_test.dart
diff --git a/tests/language_2/super_inferrer_test.dart b/tests/language_2/super/inferrer_test.dart
similarity index 100%
rename from tests/language_2/super_inferrer_test.dart
rename to tests/language_2/super/inferrer_test.dart
diff --git a/tests/language_2/super_mixin_test.dart b/tests/language_2/super/mixin_test.dart
similarity index 100%
rename from tests/language_2/super_mixin_test.dart
rename to tests/language_2/super/mixin_test.dart
diff --git a/tests/language_2/super_no_such_method1_test.dart b/tests/language_2/super/no_such_method1_test.dart
similarity index 100%
rename from tests/language_2/super_no_such_method1_test.dart
rename to tests/language_2/super/no_such_method1_test.dart
diff --git a/tests/language_2/super_no_such_method2_test.dart b/tests/language_2/super/no_such_method2_test.dart
similarity index 100%
rename from tests/language_2/super_no_such_method2_test.dart
rename to tests/language_2/super/no_such_method2_test.dart
diff --git a/tests/language_2/super_no_such_method3_test.dart b/tests/language_2/super/no_such_method3_test.dart
similarity index 100%
rename from tests/language_2/super_no_such_method3_test.dart
rename to tests/language_2/super/no_such_method3_test.dart
diff --git a/tests/language_2/super_no_such_method4_runtime_test.dart b/tests/language_2/super/no_such_method4_runtime_test.dart
similarity index 100%
rename from tests/language_2/super_no_such_method4_runtime_test.dart
rename to tests/language_2/super/no_such_method4_runtime_test.dart
diff --git a/tests/language_2/super_no_such_method4_test.dart b/tests/language_2/super/no_such_method4_test.dart
similarity index 100%
rename from tests/language_2/super_no_such_method4_test.dart
rename to tests/language_2/super/no_such_method4_test.dart
diff --git a/tests/language_2/super_no_such_method5_runtime_test.dart b/tests/language_2/super/no_such_method5_runtime_test.dart
similarity index 100%
rename from tests/language_2/super_no_such_method5_runtime_test.dart
rename to tests/language_2/super/no_such_method5_runtime_test.dart
diff --git a/tests/language_2/super_no_such_method5_test.dart b/tests/language_2/super/no_such_method5_test.dart
similarity index 100%
rename from tests/language_2/super_no_such_method5_test.dart
rename to tests/language_2/super/no_such_method5_test.dart
diff --git a/tests/language_2/non_const_super_test.dart b/tests/language_2/super/non_const_test.dart
similarity index 100%
rename from tests/language_2/non_const_super_test.dart
rename to tests/language_2/super/non_const_test.dart
diff --git a/tests/language_2/super_operator_index2_test.dart b/tests/language_2/super/operator_index2_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index2_test.dart
rename to tests/language_2/super/operator_index2_test.dart
diff --git a/tests/language_2/super_operator_index3_test.dart b/tests/language_2/super/operator_index3_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index3_test.dart
rename to tests/language_2/super/operator_index3_test.dart
diff --git a/tests/language_2/super_operator_index4_test.dart b/tests/language_2/super/operator_index4_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index4_test.dart
rename to tests/language_2/super/operator_index4_test.dart
diff --git a/tests/language_2/super_operator_index5_test.dart b/tests/language_2/super/operator_index5_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index5_test.dart
rename to tests/language_2/super/operator_index5_test.dart
diff --git a/tests/language_2/super_operator_index6_test.dart b/tests/language_2/super/operator_index6_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index6_test.dart
rename to tests/language_2/super/operator_index6_test.dart
diff --git a/tests/language_2/super_operator_index7_test.dart b/tests/language_2/super/operator_index7_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index7_test.dart
rename to tests/language_2/super/operator_index7_test.dart
diff --git a/tests/language_2/super_operator_index8_test.dart b/tests/language_2/super/operator_index8_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index8_test.dart
rename to tests/language_2/super/operator_index8_test.dart
diff --git a/tests/language_2/super_operator_index_test.dart b/tests/language_2/super/operator_index_test.dart
similarity index 100%
rename from tests/language_2/super_operator_index_test.dart
rename to tests/language_2/super/operator_index_test.dart
diff --git a/tests/language_2/super_operator_test.dart b/tests/language_2/super/operator_test.dart
similarity index 100%
rename from tests/language_2/super_operator_test.dart
rename to tests/language_2/super/operator_test.dart
diff --git a/tests/language_2/super_setter_interceptor_test.dart b/tests/language_2/super/setter_interceptor_test.dart
similarity index 100%
rename from tests/language_2/super_setter_interceptor_test.dart
rename to tests/language_2/super/setter_interceptor_test.dart
diff --git a/tests/language_2/super_setter_test.dart b/tests/language_2/super/setter_test.dart
similarity index 100%
rename from tests/language_2/super_setter_test.dart
rename to tests/language_2/super/setter_test.dart
diff --git a/tests/language_2/super_test.dart b/tests/language_2/super/super_test.dart
similarity index 100%
rename from tests/language_2/super_test.dart
rename to tests/language_2/super/super_test.dart
diff --git a/tests/language_2/aborting_switch_case_test.dart b/tests/language_2/switch/aborting_switch_case_test.dart
similarity index 100%
rename from tests/language_2/aborting_switch_case_test.dart
rename to tests/language_2/switch/aborting_switch_case_test.dart
diff --git a/tests/language_2/switch_bad_case_runtime_test.dart b/tests/language_2/switch/bad_case_runtime_test.dart
similarity index 100%
rename from tests/language_2/switch_bad_case_runtime_test.dart
rename to tests/language_2/switch/bad_case_runtime_test.dart
diff --git a/tests/language_2/switch_bad_case_test.dart b/tests/language_2/switch/bad_case_test.dart
similarity index 100%
rename from tests/language_2/switch_bad_case_test.dart
rename to tests/language_2/switch/bad_case_test.dart
diff --git a/tests/language_2/case_expression_with_assignment_runtime_test.dart b/tests/language_2/switch/case_expression_with_assignment_runtime_test.dart
similarity index 100%
rename from tests/language_2/case_expression_with_assignment_runtime_test.dart
rename to tests/language_2/switch/case_expression_with_assignment_runtime_test.dart
diff --git a/tests/language_2/case_expression_with_assignment_test.dart b/tests/language_2/switch/case_expression_with_assignment_test.dart
similarity index 100%
rename from tests/language_2/case_expression_with_assignment_test.dart
rename to tests/language_2/switch/case_expression_with_assignment_test.dart
diff --git a/tests/language_2/switch_case_runtime_test.dart b/tests/language_2/switch/case_runtime_test.dart
similarity index 100%
rename from tests/language_2/switch_case_runtime_test.dart
rename to tests/language_2/switch/case_runtime_test.dart
diff --git a/tests/language_2/switch_case_static_const_test.dart b/tests/language_2/switch/case_static_const_test.dart
similarity index 100%
rename from tests/language_2/switch_case_static_const_test.dart
rename to tests/language_2/switch/case_static_const_test.dart
diff --git a/tests/language_2/switch_case_test.dart b/tests/language_2/switch/case_test.dart
similarity index 100%
rename from tests/language_2/switch_case_test.dart
rename to tests/language_2/switch/case_test.dart
diff --git a/tests/language_2/switch_case_warn_test.dart b/tests/language_2/switch/case_warn_test.dart
similarity index 100%
rename from tests/language_2/switch_case_warn_test.dart
rename to tests/language_2/switch/case_warn_test.dart
diff --git a/tests/language_2/empty_block_case_test.dart b/tests/language_2/switch/empty_block_case_test.dart
similarity index 100%
rename from tests/language_2/empty_block_case_test.dart
rename to tests/language_2/switch/empty_block_case_test.dart
diff --git a/tests/language_2/switch_fallthru_runtime_test.dart b/tests/language_2/switch/fallthru_runtime_test.dart
similarity index 100%
rename from tests/language_2/switch_fallthru_runtime_test.dart
rename to tests/language_2/switch/fallthru_runtime_test.dart
diff --git a/tests/language_2/switch_fallthru_test.dart b/tests/language_2/switch/fallthru_test.dart
similarity index 100%
rename from tests/language_2/switch_fallthru_test.dart
rename to tests/language_2/switch/fallthru_test.dart
diff --git a/tests/language_2/infinite_switch_label_test.dart b/tests/language_2/switch/infinite_switch_label_test.dart
similarity index 100%
rename from tests/language_2/infinite_switch_label_test.dart
rename to tests/language_2/switch/infinite_switch_label_test.dart
diff --git a/tests/language_2/switch_label2_test.dart b/tests/language_2/switch/label2_test.dart
similarity index 100%
rename from tests/language_2/switch_label2_test.dart
rename to tests/language_2/switch/label2_test.dart
diff --git a/tests/language_2/switch_label_test.dart b/tests/language_2/switch/label_test.dart
similarity index 100%
rename from tests/language_2/switch_label_test.dart
rename to tests/language_2/switch/label_test.dart
diff --git a/tests/language_2/nested_switch_label_test.dart b/tests/language_2/switch/nested_switch_label_test.dart
similarity index 100%
rename from tests/language_2/nested_switch_label_test.dart
rename to tests/language_2/switch/nested_switch_label_test.dart
diff --git a/tests/language_2/switch_scope_test.dart b/tests/language_2/switch/scope_test.dart
similarity index 100%
rename from tests/language_2/switch_scope_test.dart
rename to tests/language_2/switch/scope_test.dart
diff --git a/tests/language_2/switch1_test.dart b/tests/language_2/switch/switch1_test.dart
similarity index 100%
rename from tests/language_2/switch1_test.dart
rename to tests/language_2/switch/switch1_test.dart
diff --git a/tests/language_2/switch3_test.dart b/tests/language_2/switch/switch3_test.dart
similarity index 100%
rename from tests/language_2/switch3_test.dart
rename to tests/language_2/switch/switch3_test.dart
diff --git a/tests/language_2/switch4_test.dart b/tests/language_2/switch/switch4_test.dart
similarity index 100%
rename from tests/language_2/switch4_test.dart
rename to tests/language_2/switch/switch4_test.dart
diff --git a/tests/language_2/switch5_test.dart b/tests/language_2/switch/switch5_test.dart
similarity index 100%
rename from tests/language_2/switch5_test.dart
rename to tests/language_2/switch/switch5_test.dart
diff --git a/tests/language_2/switch6_test.dart b/tests/language_2/switch/switch6_test.dart
similarity index 100%
rename from tests/language_2/switch6_test.dart
rename to tests/language_2/switch/switch6_test.dart
diff --git a/tests/language_2/switch7_test.dart b/tests/language_2/switch/switch7_test.dart
similarity index 100%
rename from tests/language_2/switch7_test.dart
rename to tests/language_2/switch/switch7_test.dart
diff --git a/tests/language_2/switch8_test.dart b/tests/language_2/switch/switch8_test.dart
similarity index 100%
rename from tests/language_2/switch8_test.dart
rename to tests/language_2/switch/switch8_test.dart
diff --git a/tests/language_2/switch_test.dart b/tests/language_2/switch/switch_test.dart
similarity index 100%
rename from tests/language_2/switch_test.dart
rename to tests/language_2/switch/switch_test.dart
diff --git a/tests/language_2/switch_try_catch_test.dart b/tests/language_2/switch/try_catch_test.dart
similarity index 100%
rename from tests/language_2/switch_try_catch_test.dart
rename to tests/language_2/switch/try_catch_test.dart
diff --git a/tests/language_2/symbol_conflict_test.dart b/tests/language_2/symbol/conflict_test.dart
similarity index 100%
rename from tests/language_2/symbol_conflict_test.dart
rename to tests/language_2/symbol/conflict_test.dart
diff --git a/tests/language_2/symbol_literal_runtime_1_test.dart b/tests/language_2/symbol/literal_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/symbol_literal_runtime_1_test.dart
rename to tests/language_2/symbol/literal_runtime_1_test.dart
diff --git a/tests/language_2/symbol_literal_runtime_test.dart b/tests/language_2/symbol/literal_runtime_test.dart
similarity index 100%
rename from tests/language_2/symbol_literal_runtime_test.dart
rename to tests/language_2/symbol/literal_runtime_test.dart
diff --git a/tests/language_2/symbol_literal_test.dart b/tests/language_2/symbol/literal_test.dart
similarity index 100%
rename from tests/language_2/symbol_literal_test.dart
rename to tests/language_2/symbol/literal_test.dart
diff --git a/tests/language_2/syncstar_covariant_type_test.dart b/tests/language_2/sync_star/covariant_type_test.dart
similarity index 100%
rename from tests/language_2/syncstar_covariant_type_test.dart
rename to tests/language_2/sync_star/covariant_type_test.dart
diff --git a/tests/language_2/syncstar_dcall_type_test.dart b/tests/language_2/sync_star/dcall_type_test.dart
similarity index 100%
rename from tests/language_2/syncstar_dcall_type_test.dart
rename to tests/language_2/sync_star/dcall_type_test.dart
diff --git a/tests/language_2/sync_generator1_runtime_test.dart b/tests/language_2/sync_star/generator1_runtime_test.dart
similarity index 100%
rename from tests/language_2/sync_generator1_runtime_test.dart
rename to tests/language_2/sync_star/generator1_runtime_test.dart
diff --git a/tests/language_2/sync_generator1_test.dart b/tests/language_2/sync_star/generator1_test.dart
similarity index 100%
rename from tests/language_2/sync_generator1_test.dart
rename to tests/language_2/sync_star/generator1_test.dart
diff --git a/tests/language_2/sync_generator2_test.dart b/tests/language_2/sync_star/generator2_test.dart
similarity index 100%
rename from tests/language_2/sync_generator2_test.dart
rename to tests/language_2/sync_star/generator2_test.dart
diff --git a/tests/language_2/sync_generator3_test.dart b/tests/language_2/sync_star/generator3_test.dart
similarity index 100%
rename from tests/language_2/sync_generator3_test.dart
rename to tests/language_2/sync_star/generator3_test.dart
diff --git a/tests/language_2/syncstar_less_than_test.dart b/tests/language_2/sync_star/less_than_test.dart
similarity index 100%
rename from tests/language_2/syncstar_less_than_test.dart
rename to tests/language_2/sync_star/less_than_test.dart
diff --git a/tests/language_2/yieldstar_pause_test.dart b/tests/language_2/sync_star/yield_star_pause_test.dart
similarity index 100%
rename from tests/language_2/yieldstar_pause_test.dart
rename to tests/language_2/sync_star/yield_star_pause_test.dart
diff --git a/tests/language_2/syncstar_yield_test.dart b/tests/language_2/sync_star/yield_test.dart
similarity index 100%
rename from tests/language_2/syncstar_yield_test.dart
rename to tests/language_2/sync_star/yield_test.dart
diff --git a/tests/language_2/syncstar_yieldstar_test.dart b/tests/language_2/sync_star/yieldstar_test.dart
similarity index 100%
rename from tests/language_2/syncstar_yieldstar_test.dart
rename to tests/language_2/sync_star/yieldstar_test.dart
diff --git a/tests/language_2/deep_nesting_expression_test.dart b/tests/language_2/syntax/deep_nesting_expression_test.dart
similarity index 100%
rename from tests/language_2/deep_nesting_expression_test.dart
rename to tests/language_2/syntax/deep_nesting_expression_test.dart
diff --git a/tests/language_2/deep_nesting_statement_test.dart b/tests/language_2/syntax/deep_nesting_statement_test.dart
similarity index 100%
rename from tests/language_2/deep_nesting_statement_test.dart
rename to tests/language_2/syntax/deep_nesting_statement_test.dart
diff --git a/tests/language_2/nested_comments_test.dart b/tests/language_2/syntax/nested_comments_test.dart
similarity index 100%
rename from tests/language_2/nested_comments_test.dart
rename to tests/language_2/syntax/nested_comments_test.dart
diff --git a/tests/language_2/statement_test.dart b/tests/language_2/syntax/statement_test.dart
similarity index 100%
rename from tests/language_2/statement_test.dart
rename to tests/language_2/syntax/statement_test.dart
diff --git a/tests/language_2/syntax_test.dart b/tests/language_2/syntax/syntax_test.dart
similarity index 100%
rename from tests/language_2/syntax_test.dart
rename to tests/language_2/syntax/syntax_test.dart
diff --git a/tests/language_2/unbalanced_brace_test.dart b/tests/language_2/syntax/unbalanced_brace_test.dart
similarity index 100%
rename from tests/language_2/unbalanced_brace_test.dart
rename to tests/language_2/syntax/unbalanced_brace_test.dart
diff --git a/tests/language_2/this_as_covariant_call_checks_test.dart b/tests/language_2/this/as_covariant_call_checks_test.dart
similarity index 100%
rename from tests/language_2/this_as_covariant_call_checks_test.dart
rename to tests/language_2/this/as_covariant_call_checks_test.dart
diff --git a/tests/language_2/this_as_dynamic_call_checks_test.dart b/tests/language_2/this/as_dynamic_call_checks_test.dart
similarity index 100%
rename from tests/language_2/this_as_dynamic_call_checks_test.dart
rename to tests/language_2/this/as_dynamic_call_checks_test.dart
diff --git a/tests/language_2/call_this_test.dart b/tests/language_2/this/call_this_test.dart
similarity index 100%
rename from tests/language_2/call_this_test.dart
rename to tests/language_2/this/call_this_test.dart
diff --git a/tests/language_2/this_conditional_operator_runtime_test.dart b/tests/language_2/this/conditional_operator_runtime_test.dart
similarity index 100%
rename from tests/language_2/this_conditional_operator_runtime_test.dart
rename to tests/language_2/this/conditional_operator_runtime_test.dart
diff --git a/tests/language_2/this_conditional_operator_test.dart b/tests/language_2/this/conditional_operator_test.dart
similarity index 100%
rename from tests/language_2/this_conditional_operator_test.dart
rename to tests/language_2/this/conditional_operator_test.dart
diff --git a/tests/language_2/implicit_this_runtime_test.dart b/tests/language_2/this/implicit_runtime_test.dart
similarity index 100%
rename from tests/language_2/implicit_this_runtime_test.dart
rename to tests/language_2/this/implicit_runtime_test.dart
diff --git a/tests/language_2/implicit_this_test.dart b/tests/language_2/this/implicit_this_test.dart
similarity index 100%
rename from tests/language_2/implicit_this_test.dart
rename to tests/language_2/this/implicit_this_test.dart
diff --git a/tests/language_2/this_in_initializer_test.dart b/tests/language_2/this/in_initializer_test.dart
similarity index 100%
rename from tests/language_2/this_in_initializer_test.dart
rename to tests/language_2/this/in_initializer_test.dart
diff --git a/tests/language_2/this_runtime_test.dart b/tests/language_2/this/runtime_test.dart
similarity index 100%
rename from tests/language_2/this_runtime_test.dart
rename to tests/language_2/this/runtime_test.dart
diff --git a/tests/language_2/this_test.dart b/tests/language_2/this/this_test.dart
similarity index 100%
rename from tests/language_2/this_test.dart
rename to tests/language_2/this/this_test.dart
diff --git a/tests/language_2/toplevel_collision1_test.dart b/tests/language_2/top_level/collision1_test.dart
similarity index 100%
rename from tests/language_2/toplevel_collision1_test.dart
rename to tests/language_2/top_level/collision1_test.dart
diff --git a/tests/language_2/toplevel_collision2_test.dart b/tests/language_2/top_level/collision2_test.dart
similarity index 100%
rename from tests/language_2/toplevel_collision2_test.dart
rename to tests/language_2/top_level/collision2_test.dart
diff --git a/tests/language_2/top_level_file1.dart b/tests/language_2/top_level/file1.dart
similarity index 100%
rename from tests/language_2/top_level_file1.dart
rename to tests/language_2/top_level/file1.dart
diff --git a/tests/language_2/top_level_file2.dart b/tests/language_2/top_level/file2.dart
similarity index 100%
rename from tests/language_2/top_level_file2.dart
rename to tests/language_2/top_level/file2.dart
diff --git a/tests/language_2/top_level_file3.dart b/tests/language_2/top_level/file3.dart
similarity index 100%
rename from tests/language_2/top_level_file3.dart
rename to tests/language_2/top_level/file3.dart
diff --git a/tests/language_2/top_level_func_test.dart b/tests/language_2/top_level/func_test.dart
similarity index 100%
rename from tests/language_2/top_level_func_test.dart
rename to tests/language_2/top_level/func_test.dart
diff --git a/tests/language_2/top_level_getter_arrow_syntax_test.dart b/tests/language_2/top_level/getter_arrow_syntax_test.dart
similarity index 100%
rename from tests/language_2/top_level_getter_arrow_syntax_test.dart
rename to tests/language_2/top_level/getter_arrow_syntax_test.dart
diff --git a/tests/language_2/top_level_getter_no_setter1_test.dart b/tests/language_2/top_level/getter_no_setter1_test.dart
similarity index 100%
rename from tests/language_2/top_level_getter_no_setter1_test.dart
rename to tests/language_2/top_level/getter_no_setter1_test.dart
diff --git a/tests/language_2/top_level_getter_no_setter2_test.dart b/tests/language_2/top_level/getter_no_setter2_test.dart
similarity index 100%
rename from tests/language_2/top_level_getter_no_setter2_test.dart
rename to tests/language_2/top_level/getter_no_setter2_test.dart
diff --git a/tests/language_2/top_level_in_initializer_test.dart b/tests/language_2/top_level/in_initializer_test.dart
similarity index 100%
rename from tests/language_2/top_level_in_initializer_test.dart
rename to tests/language_2/top_level/in_initializer_test.dart
diff --git a/tests/language_2/top_level_method_test.dart b/tests/language_2/top_level/method_test.dart
similarity index 100%
rename from tests/language_2/top_level_method_test.dart
rename to tests/language_2/top_level/method_test.dart
diff --git a/tests/language_2/top_level_multiple_files_test.dart b/tests/language_2/top_level/multiple_files_test.dart
similarity index 83%
rename from tests/language_2/top_level_multiple_files_test.dart
rename to tests/language_2/top_level/multiple_files_test.dart
index 58ae744a1b4..53f578e562c 100644
--- a/tests/language_2/top_level_multiple_files_test.dart
+++ b/tests/language_2/top_level/multiple_files_test.dart
@@ -5,5 +5,5 @@
 library TopLevelMultipleFilesTest.dart;
 
 import "package:expect/expect.dart";
-part 'top_level_file1.dart';
-part 'top_level_file2.dart';
+part 'file1.dart';
+part 'file2.dart';
diff --git a/tests/language_2/top_level_non_prefixed_library_test.dart b/tests/language_2/top_level/non_prefixed_library_test.dart
similarity index 80%
rename from tests/language_2/top_level_non_prefixed_library_test.dart
rename to tests/language_2/top_level/non_prefixed_library_test.dart
index 27061b4aafc..937170ccc1d 100644
--- a/tests/language_2/top_level_non_prefixed_library_test.dart
+++ b/tests/language_2/top_level/non_prefixed_library_test.dart
@@ -5,5 +5,5 @@
 library TopLevelMultipleFilesTest.dart;
 
 import "package:expect/expect.dart";
-import 'top_level_prefixed_library.dart';
-part 'top_level_file1.dart';
+import 'prefixed_library.dart';
+part 'file1.dart';
diff --git a/tests/language_2/top_level_prefixed_declaration_test.dart b/tests/language_2/top_level/prefixed_declaration_test.dart
similarity index 93%
rename from tests/language_2/top_level_prefixed_declaration_test.dart
rename to tests/language_2/top_level/prefixed_declaration_test.dart
index 008ec68e6f4..6b212740b91 100644
--- a/tests/language_2/top_level_prefixed_declaration_test.dart
+++ b/tests/language_2/top_level/prefixed_declaration_test.dart
@@ -7,7 +7,7 @@
 library main;
 
 import "package:expect/expect.dart";
-import "library11.dart" as lib11;
+import "../library11.dart" as lib11;
 
 lib11.Library11 variable = null;
 
diff --git a/tests/language_2/top_level_prefixed_library.dart b/tests/language_2/top_level/prefixed_library.dart
similarity index 100%
rename from tests/language_2/top_level_prefixed_library.dart
rename to tests/language_2/top_level/prefixed_library.dart
diff --git a/tests/language_2/unresolved_top_level_method_test.dart b/tests/language_2/top_level/unresolved_method_test.dart
similarity index 100%
rename from tests/language_2/unresolved_top_level_method_test.dart
rename to tests/language_2/top_level/unresolved_method_test.dart
diff --git a/tests/language_2/unresolved_top_level_var_test.dart b/tests/language_2/top_level/unresolved_var_test.dart
similarity index 99%
rename from tests/language_2/unresolved_top_level_var_test.dart
rename to tests/language_2/top_level/unresolved_var_test.dart
index daf5305017c..c2e5f727f1e 100644
--- a/tests/language_2/unresolved_top_level_var_test.dart
+++ b/tests/language_2/top_level/unresolved_var_test.dart
@@ -9,4 +9,4 @@ var a = b; /*@compile-error=unspecified*/
 
 main() {
   print(a);
-}
\ No newline at end of file
+}
diff --git a/tests/language_2/top_level_var_test.dart b/tests/language_2/top_level/var_test.dart
similarity index 100%
rename from tests/language_2/top_level_var_test.dart
rename to tests/language_2/top_level/var_test.dart
diff --git a/tests/language_2/type_alias_equality_test.dart b/tests/language_2/type/alias_equality_test.dart
similarity index 100%
rename from tests/language_2/type_alias_equality_test.dart
rename to tests/language_2/type/alias_equality_test.dart
diff --git a/tests/language_2/type_check_const_function_typedef2_test.dart b/tests/language_2/type/check_const_function_typedef2_test.dart
similarity index 100%
rename from tests/language_2/type_check_const_function_typedef2_test.dart
rename to tests/language_2/type/check_const_function_typedef2_test.dart
diff --git a/tests/language_2/type_check_const_function_typedef_test.dart b/tests/language_2/type/check_const_function_typedef_test.dart
similarity index 100%
rename from tests/language_2/type_check_const_function_typedef_test.dart
rename to tests/language_2/type/check_const_function_typedef_test.dart
diff --git a/tests/language_2/type_check_test.dart b/tests/language_2/type/check_test.dart
similarity index 100%
rename from tests/language_2/type_check_test.dart
rename to tests/language_2/type/check_test.dart
diff --git a/tests/language_2/type_checks_in_factory_method_runtime_test.dart b/tests/language_2/type/checks_in_factory_method_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_checks_in_factory_method_runtime_test.dart
rename to tests/language_2/type/checks_in_factory_method_runtime_test.dart
diff --git a/tests/language_2/type_checks_in_factory_method_test.dart b/tests/language_2/type/checks_in_factory_method_test.dart
similarity index 100%
rename from tests/language_2/type_checks_in_factory_method_test.dart
rename to tests/language_2/type/checks_in_factory_method_test.dart
diff --git a/tests/language_2/type_constants_test.dart b/tests/language_2/type/constants_test.dart
similarity index 100%
rename from tests/language_2/type_constants_test.dart
rename to tests/language_2/type/constants_test.dart
diff --git a/tests/language_2/type_conversion_ssa_test.dart b/tests/language_2/type/conversion_ssa_test.dart
similarity index 100%
rename from tests/language_2/type_conversion_ssa_test.dart
rename to tests/language_2/type/conversion_ssa_test.dart
diff --git a/tests/language_2/type_error_test.dart b/tests/language_2/type/error_test.dart
similarity index 100%
rename from tests/language_2/type_error_test.dart
rename to tests/language_2/type/error_test.dart
diff --git a/tests/language_2/type_guard_conversion_test.dart b/tests/language_2/type/guard_conversion_test.dart
similarity index 100%
rename from tests/language_2/type_guard_conversion_test.dart
rename to tests/language_2/type/guard_conversion_test.dart
diff --git a/tests/language_2/type_hoisting_test.dart b/tests/language_2/type/hoisting_test.dart
similarity index 100%
rename from tests/language_2/type_hoisting_test.dart
rename to tests/language_2/type/hoisting_test.dart
diff --git a/tests/language_2/type_intersection_test.dart b/tests/language_2/type/intersection_test.dart
similarity index 100%
rename from tests/language_2/type_intersection_test.dart
rename to tests/language_2/type/intersection_test.dart
diff --git a/tests/language_2/constant_type_literal_runtime_test.dart b/tests/language_2/type_object/constant_type_literal_runtime_test.dart
similarity index 100%
rename from tests/language_2/constant_type_literal_runtime_test.dart
rename to tests/language_2/type_object/constant_type_literal_runtime_test.dart
diff --git a/tests/language_2/constant_type_literal_test.dart b/tests/language_2/type_object/constant_type_literal_test.dart
similarity index 100%
rename from tests/language_2/constant_type_literal_test.dart
rename to tests/language_2/type_object/constant_type_literal_test.dart
diff --git a/tests/language_2/first_class_types_constants_test.dart b/tests/language_2/type_object/first_class_types_constants_test.dart
similarity index 100%
rename from tests/language_2/first_class_types_constants_test.dart
rename to tests/language_2/type_object/first_class_types_constants_test.dart
diff --git a/tests/language_2/first_class_types_lib1.dart b/tests/language_2/type_object/first_class_types_lib1.dart
similarity index 100%
rename from tests/language_2/first_class_types_lib1.dart
rename to tests/language_2/type_object/first_class_types_lib1.dart
diff --git a/tests/language_2/first_class_types_lib2.dart b/tests/language_2/type_object/first_class_types_lib2.dart
similarity index 100%
rename from tests/language_2/first_class_types_lib2.dart
rename to tests/language_2/type_object/first_class_types_lib2.dart
diff --git a/tests/language_2/first_class_types_libraries_test.dart b/tests/language_2/type_object/first_class_types_libraries_test.dart
similarity index 100%
rename from tests/language_2/first_class_types_libraries_test.dart
rename to tests/language_2/type_object/first_class_types_libraries_test.dart
diff --git a/tests/language_2/first_class_types_literals_runtime_1_test.dart b/tests/language_2/type_object/first_class_types_literals_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/first_class_types_literals_runtime_1_test.dart
rename to tests/language_2/type_object/first_class_types_literals_runtime_1_test.dart
diff --git a/tests/language_2/first_class_types_literals_runtime_2_test.dart b/tests/language_2/type_object/first_class_types_literals_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/first_class_types_literals_runtime_2_test.dart
rename to tests/language_2/type_object/first_class_types_literals_runtime_2_test.dart
diff --git a/tests/language_2/first_class_types_literals_runtime_test.dart b/tests/language_2/type_object/first_class_types_literals_runtime_test.dart
similarity index 100%
rename from tests/language_2/first_class_types_literals_runtime_test.dart
rename to tests/language_2/type_object/first_class_types_literals_runtime_test.dart
diff --git a/tests/language_2/first_class_types_literals_test.dart b/tests/language_2/type_object/first_class_types_literals_test.dart
similarity index 100%
rename from tests/language_2/first_class_types_literals_test.dart
rename to tests/language_2/type_object/first_class_types_literals_test.dart
diff --git a/tests/language_2/first_class_types_test.dart b/tests/language_2/type_object/first_class_types_test.dart
similarity index 100%
rename from tests/language_2/first_class_types_test.dart
rename to tests/language_2/type_object/first_class_types_test.dart
diff --git a/tests/language_2/type_literal_canonicalization_test.dart b/tests/language_2/type_object/literal_canonicalization_test.dart
similarity index 100%
rename from tests/language_2/type_literal_canonicalization_test.dart
rename to tests/language_2/type_object/literal_canonicalization_test.dart
diff --git a/tests/language_2/type_literal_prefix_call_test.dart b/tests/language_2/type_object/literal_prefix_call_test.dart
similarity index 100%
rename from tests/language_2/type_literal_prefix_call_test.dart
rename to tests/language_2/type_object/literal_prefix_call_test.dart
diff --git a/tests/language_2/type_literal_test.dart b/tests/language_2/type_object/literal_type_literal_test.dart
similarity index 98%
rename from tests/language_2/type_literal_test.dart
rename to tests/language_2/type_object/literal_type_literal_test.dart
index 6eee895bdae..78c0541e1a9 100644
--- a/tests/language_2/type_literal_test.dart
+++ b/tests/language_2/type_object/literal_type_literal_test.dart
@@ -4,7 +4,7 @@
 
 import "package:expect/expect.dart";
 
-import 'type_literal_test.dart' as prefix;
+import 'literal_type_literal_test.dart' as prefix;
 
 // TODO(rnystrom): This test has a lot of overlap with some other language
 // tests, but those are sort of all over the place so I thought it useful to
diff --git a/tests/language_2/reify_typevar_test.dart b/tests/language_2/type_object/reify_type_variable_test.dart
similarity index 100%
rename from tests/language_2/reify_typevar_test.dart
rename to tests/language_2/type_object/reify_type_variable_test.dart
diff --git a/tests/language_2/runtime_type_function_test.dart b/tests/language_2/type_object/runtime_type_function_test.dart
similarity index 100%
rename from tests/language_2/runtime_type_function_test.dart
rename to tests/language_2/type_object/runtime_type_function_test.dart
diff --git a/tests/language_2/runtime_type_test.dart b/tests/language_2/type_object/runtime_type_test.dart
similarity index 100%
rename from tests/language_2/runtime_type_test.dart
rename to tests/language_2/type_object/runtime_type_test.dart
diff --git a/tests/language_2/type_promotion_assign_runtime_test.dart b/tests/language_2/type_promotion/assign_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_assign_runtime_test.dart
rename to tests/language_2/type_promotion/assign_runtime_test.dart
diff --git a/tests/language_2/type_promotion_assign_test.dart b/tests/language_2/type_promotion/assign_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_assign_test.dart
rename to tests/language_2/type_promotion/assign_test.dart
diff --git a/tests/language_2/type_promotion_closure_runtime_1_test.dart b/tests/language_2/type_promotion/closure_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_closure_runtime_1_test.dart
rename to tests/language_2/type_promotion/closure_runtime_1_test.dart
diff --git a/tests/language_2/type_promotion_closure_runtime_2_test.dart b/tests/language_2/type_promotion/closure_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_closure_runtime_2_test.dart
rename to tests/language_2/type_promotion/closure_runtime_2_test.dart
diff --git a/tests/language_2/type_promotion_closure_runtime_test.dart b/tests/language_2/type_promotion/closure_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_closure_runtime_test.dart
rename to tests/language_2/type_promotion/closure_runtime_test.dart
diff --git a/tests/language_2/type_promotion_closure_test.dart b/tests/language_2/type_promotion/closure_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_closure_test.dart
rename to tests/language_2/type_promotion/closure_test.dart
diff --git a/tests/language_2/type_promotion_functions_runtime_test.dart b/tests/language_2/type_promotion/functions_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_functions_runtime_test.dart
rename to tests/language_2/type_promotion/functions_runtime_test.dart
diff --git a/tests/language_2/type_promotion_functions_test.dart b/tests/language_2/type_promotion/functions_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_functions_test.dart
rename to tests/language_2/type_promotion/functions_test.dart
diff --git a/tests/language_2/type_promotion_local_runtime_test.dart b/tests/language_2/type_promotion/local_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_local_runtime_test.dart
rename to tests/language_2/type_promotion/local_runtime_test.dart
diff --git a/tests/language_2/type_promotion_local_test.dart b/tests/language_2/type_promotion/local_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_local_test.dart
rename to tests/language_2/type_promotion/local_test.dart
diff --git a/tests/language_2/type_promotion_logical_and_runtime_test.dart b/tests/language_2/type_promotion/logical_and_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_logical_and_runtime_test.dart
rename to tests/language_2/type_promotion/logical_and_runtime_test.dart
diff --git a/tests/language_2/type_promotion_logical_and_test.dart b/tests/language_2/type_promotion/logical_and_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_logical_and_test.dart
rename to tests/language_2/type_promotion/logical_and_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_runtime_1_test.dart b/tests/language_2/type_promotion/more_specific_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_runtime_1_test.dart
rename to tests/language_2/type_promotion/more_specific_runtime_1_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_runtime_2_test.dart b/tests/language_2/type_promotion/more_specific_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_runtime_2_test.dart
rename to tests/language_2/type_promotion/more_specific_runtime_2_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_runtime_3_test.dart b/tests/language_2/type_promotion/more_specific_runtime_3_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_runtime_3_test.dart
rename to tests/language_2/type_promotion/more_specific_runtime_3_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_runtime_4_test.dart b/tests/language_2/type_promotion/more_specific_runtime_4_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_runtime_4_test.dart
rename to tests/language_2/type_promotion/more_specific_runtime_4_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_runtime_5_test.dart b/tests/language_2/type_promotion/more_specific_runtime_5_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_runtime_5_test.dart
rename to tests/language_2/type_promotion/more_specific_runtime_5_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_runtime_6_test.dart b/tests/language_2/type_promotion/more_specific_runtime_6_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_runtime_6_test.dart
rename to tests/language_2/type_promotion/more_specific_runtime_6_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_runtime_test.dart b/tests/language_2/type_promotion/more_specific_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_runtime_test.dart
rename to tests/language_2/type_promotion/more_specific_runtime_test.dart
diff --git a/tests/language_2/type_promotion_more_specific_test.dart b/tests/language_2/type_promotion/more_specific_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_more_specific_test.dart
rename to tests/language_2/type_promotion/more_specific_test.dart
diff --git a/tests/language_2/type_promotion_multiple_runtime_test.dart b/tests/language_2/type_promotion/multiple_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_multiple_runtime_test.dart
rename to tests/language_2/type_promotion/multiple_runtime_test.dart
diff --git a/tests/language_2/type_promotion_multiple_test.dart b/tests/language_2/type_promotion/multiple_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_multiple_test.dart
rename to tests/language_2/type_promotion/multiple_test.dart
diff --git a/tests/language_2/type_promotion_parameter_runtime_test.dart b/tests/language_2/type_promotion/parameter_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_parameter_runtime_test.dart
rename to tests/language_2/type_promotion/parameter_runtime_test.dart
diff --git a/tests/language_2/type_promotion_parameter_test.dart b/tests/language_2/type_promotion/parameter_test.dart
similarity index 100%
rename from tests/language_2/type_promotion_parameter_test.dart
rename to tests/language_2/type_promotion/parameter_test.dart
diff --git a/tests/language_2/type_variable_bound_access_runtime_test.dart b/tests/language_2/type_variable/bound_access_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_variable_bound_access_runtime_test.dart
rename to tests/language_2/type_variable/bound_access_runtime_test.dart
diff --git a/tests/language_2/type_variable_bound_access_test.dart b/tests/language_2/type_variable/bound_access_test.dart
similarity index 100%
rename from tests/language_2/type_variable_bound_access_test.dart
rename to tests/language_2/type_variable/bound_access_test.dart
diff --git a/tests/language_2/type_variable_bounds2_test.dart b/tests/language_2/type_variable/bounds2_test.dart
similarity index 99%
rename from tests/language_2/type_variable_bounds2_test.dart
rename to tests/language_2/type_variable/bounds2_test.dart
index a0eb4bacff8..ecb6c9f62a7 100644
--- a/tests/language_2/type_variable_bounds2_test.dart
+++ b/tests/language_2/type_variable/bounds2_test.dart
@@ -16,4 +16,4 @@ main() {
   // We are only interested in the instance creation, hence
   // the result is assigned to `dynamic`.
   dynamic a = /*@compile-error=unspecified*/ new A<String>();
-}
\ No newline at end of file
+}
diff --git a/tests/language_2/type_variable_bounds3_runtime_test.dart b/tests/language_2/type_variable/bounds3_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_variable_bounds3_runtime_test.dart
rename to tests/language_2/type_variable/bounds3_runtime_test.dart
diff --git a/tests/language_2/type_variable_bounds3_test.dart b/tests/language_2/type_variable/bounds3_test.dart
similarity index 100%
rename from tests/language_2/type_variable_bounds3_test.dart
rename to tests/language_2/type_variable/bounds3_test.dart
diff --git a/tests/language_2/type_variable_bounds4_runtime_test.dart b/tests/language_2/type_variable/bounds4_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_variable_bounds4_runtime_test.dart
rename to tests/language_2/type_variable/bounds4_runtime_test.dart
diff --git a/tests/language_2/type_variable_bounds4_test.dart b/tests/language_2/type_variable/bounds4_test.dart
similarity index 100%
rename from tests/language_2/type_variable_bounds4_test.dart
rename to tests/language_2/type_variable/bounds4_test.dart
diff --git a/tests/language_2/type_variable_bounds_test.dart b/tests/language_2/type_variable/bounds_test.dart
similarity index 100%
rename from tests/language_2/type_variable_bounds_test.dart
rename to tests/language_2/type_variable/bounds_test.dart
diff --git a/tests/language_2/type_variable_closure2_test.dart b/tests/language_2/type_variable/closure2_test.dart
similarity index 100%
rename from tests/language_2/type_variable_closure2_test.dart
rename to tests/language_2/type_variable/closure2_test.dart
diff --git a/tests/language_2/type_variable_closure3_test.dart b/tests/language_2/type_variable/closure3_test.dart
similarity index 100%
rename from tests/language_2/type_variable_closure3_test.dart
rename to tests/language_2/type_variable/closure3_test.dart
diff --git a/tests/language_2/type_variable_closure4_test.dart b/tests/language_2/type_variable/closure4_test.dart
similarity index 100%
rename from tests/language_2/type_variable_closure4_test.dart
rename to tests/language_2/type_variable/closure4_test.dart
diff --git a/tests/language_2/type_variable_closure_test.dart b/tests/language_2/type_variable/closure_test.dart
similarity index 100%
rename from tests/language_2/type_variable_closure_test.dart
rename to tests/language_2/type_variable/closure_test.dart
diff --git a/tests/language_2/type_variable_conflict2_runtime_test.dart b/tests/language_2/type_variable/conflict2_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_variable_conflict2_runtime_test.dart
rename to tests/language_2/type_variable/conflict2_runtime_test.dart
diff --git a/tests/language_2/type_variable_conflict2_test.dart b/tests/language_2/type_variable/conflict2_test.dart
similarity index 100%
rename from tests/language_2/type_variable_conflict2_test.dart
rename to tests/language_2/type_variable/conflict2_test.dart
diff --git a/tests/language_2/type_variable_conflict_runtime_test.dart b/tests/language_2/type_variable/conflict_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_variable_conflict_runtime_test.dart
rename to tests/language_2/type_variable/conflict_runtime_test.dart
diff --git a/tests/language_2/type_variable_conflict_test.dart b/tests/language_2/type_variable/conflict_test.dart
similarity index 100%
rename from tests/language_2/type_variable_conflict_test.dart
rename to tests/language_2/type_variable/conflict_test.dart
diff --git a/tests/language_2/type_variable_field_initializer2_test.dart b/tests/language_2/type_variable/field_initializer2_test.dart
similarity index 100%
rename from tests/language_2/type_variable_field_initializer2_test.dart
rename to tests/language_2/type_variable/field_initializer2_test.dart
diff --git a/tests/language_2/type_variable_field_initializer_closure2_test.dart b/tests/language_2/type_variable/field_initializer_closure2_test.dart
similarity index 100%
rename from tests/language_2/type_variable_field_initializer_closure2_test.dart
rename to tests/language_2/type_variable/field_initializer_closure2_test.dart
diff --git a/tests/language_2/type_variable_field_initializer_closure_test.dart b/tests/language_2/type_variable/field_initializer_closure_test.dart
similarity index 100%
rename from tests/language_2/type_variable_field_initializer_closure_test.dart
rename to tests/language_2/type_variable/field_initializer_closure_test.dart
diff --git a/tests/language_2/type_variable_field_initializer_test.dart b/tests/language_2/type_variable/field_initializer_test.dart
similarity index 100%
rename from tests/language_2/type_variable_field_initializer_test.dart
rename to tests/language_2/type_variable/field_initializer_test.dart
diff --git a/tests/language_2/type_variable_function_type_test.dart b/tests/language_2/type_variable/function_type_test.dart
similarity index 100%
rename from tests/language_2/type_variable_function_type_test.dart
rename to tests/language_2/type_variable/function_type_test.dart
diff --git a/tests/language_2/type_variable_identifier_expression_test.dart b/tests/language_2/type_variable/identifier_expression_test.dart
similarity index 100%
rename from tests/language_2/type_variable_identifier_expression_test.dart
rename to tests/language_2/type_variable/identifier_expression_test.dart
diff --git a/tests/language_2/type_variable_initializer_test.dart b/tests/language_2/type_variable/initializer_test.dart
similarity index 100%
rename from tests/language_2/type_variable_initializer_test.dart
rename to tests/language_2/type_variable/initializer_test.dart
diff --git a/tests/language_2/type_variable_nested_test.dart b/tests/language_2/type_variable/nested_test.dart
similarity index 100%
rename from tests/language_2/type_variable_nested_test.dart
rename to tests/language_2/type_variable/nested_test.dart
diff --git a/tests/language_2/type_variable_promotion_test.dart b/tests/language_2/type_variable/promotion_test.dart
similarity index 100%
rename from tests/language_2/type_variable_promotion_test.dart
rename to tests/language_2/type_variable/promotion_test.dart
diff --git a/tests/language_2/type_variable_scope2_test.dart b/tests/language_2/type_variable/scope2_test.dart
similarity index 100%
rename from tests/language_2/type_variable_scope2_test.dart
rename to tests/language_2/type_variable/scope2_test.dart
diff --git a/tests/language_2/type_variable_scope3_runtime_test.dart b/tests/language_2/type_variable/scope3_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_variable_scope3_runtime_test.dart
rename to tests/language_2/type_variable/scope3_runtime_test.dart
diff --git a/tests/language_2/type_variable_scope3_test.dart b/tests/language_2/type_variable/scope3_test.dart
similarity index 100%
rename from tests/language_2/type_variable_scope3_test.dart
rename to tests/language_2/type_variable/scope3_test.dart
diff --git a/tests/language_2/type_variable_scope_runtime_test.dart b/tests/language_2/type_variable/scope_runtime_test.dart
similarity index 100%
rename from tests/language_2/type_variable_scope_runtime_test.dart
rename to tests/language_2/type_variable/scope_runtime_test.dart
diff --git a/tests/language_2/type_variable_scope_test.dart b/tests/language_2/type_variable/scope_test.dart
similarity index 100%
rename from tests/language_2/type_variable_scope_test.dart
rename to tests/language_2/type_variable/scope_test.dart
diff --git a/tests/language_2/type_variable_static_context_test.dart b/tests/language_2/type_variable/static_context_test.dart
similarity index 100%
rename from tests/language_2/type_variable_static_context_test.dart
rename to tests/language_2/type_variable/static_context_test.dart
diff --git a/tests/language_2/type_variable_typedef_test.dart b/tests/language_2/type_variable/typedef_test.dart
similarity index 100%
rename from tests/language_2/type_variable_typedef_test.dart
rename to tests/language_2/type_variable/typedef_test.dart
diff --git a/tests/language_2/bad_typedef_runtime_test.dart b/tests/language_2/typedef/bad_typedef_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_typedef_runtime_test.dart
rename to tests/language_2/typedef/bad_typedef_runtime_test.dart
diff --git a/tests/language_2/bad_typedef_test.dart b/tests/language_2/typedef/bad_typedef_test.dart
similarity index 100%
rename from tests/language_2/bad_typedef_test.dart
rename to tests/language_2/typedef/bad_typedef_test.dart
diff --git a/tests/language_2/typedef_check_bounds_generic_test.dart b/tests/language_2/typedef/check_bounds_generic_test.dart
similarity index 100%
rename from tests/language_2/typedef_check_bounds_generic_test.dart
rename to tests/language_2/typedef/check_bounds_generic_test.dart
diff --git a/tests/language_2/typedef_check_bounds_test.dart b/tests/language_2/typedef/check_bounds_test.dart
similarity index 100%
rename from tests/language_2/typedef_check_bounds_test.dart
rename to tests/language_2/typedef/check_bounds_test.dart
diff --git a/tests/language_2/typedef_check_bounds_unused_test.dart b/tests/language_2/typedef/check_bounds_unused_test.dart
similarity index 100%
rename from tests/language_2/typedef_check_bounds_unused_test.dart
rename to tests/language_2/typedef/check_bounds_unused_test.dart
diff --git a/tests/language_2/typedef_class_in_other_file_helper.dart b/tests/language_2/typedef/class_in_other_file_helper.dart
similarity index 100%
rename from tests/language_2/typedef_class_in_other_file_helper.dart
rename to tests/language_2/typedef/class_in_other_file_helper.dart
diff --git a/tests/language_2/typedef_class_in_other_file_test.dart b/tests/language_2/typedef/class_in_other_file_test.dart
similarity index 88%
rename from tests/language_2/typedef_class_in_other_file_test.dart
rename to tests/language_2/typedef/class_in_other_file_test.dart
index 5300104122d..c4a5b1a588d 100644
--- a/tests/language_2/typedef_class_in_other_file_test.dart
+++ b/tests/language_2/typedef/class_in_other_file_test.dart
@@ -5,7 +5,7 @@
 // This has crashed DDC with Kernel because of a
 // "Concurrent modification during iteration" exception.
 
-import 'typedef_class_in_other_file_helper.dart';
+import 'class_in_other_file_helper.dart';
 
 typedef bool Foo1(bool baz);
 typedef bool Foo2(Bar baz);
diff --git a/tests/language_2/cyclic_typedef_test.dart b/tests/language_2/typedef/cyclic_test.dart
similarity index 100%
rename from tests/language_2/cyclic_typedef_test.dart
rename to tests/language_2/typedef/cyclic_test.dart
diff --git a/tests/language_2/typedef_is_test.dart b/tests/language_2/typedef/is_test.dart
similarity index 100%
rename from tests/language_2/typedef_is_test.dart
rename to tests/language_2/typedef/is_test.dart
diff --git a/tests/language_2/ackermann_test.dart b/tests/language_2/unsorted/ackermann_test.dart
similarity index 100%
rename from tests/language_2/ackermann_test.dart
rename to tests/language_2/unsorted/ackermann_test.dart
diff --git a/tests/language_2/additional_interface_adds_optional_args_concrete_test.dart b/tests/language_2/unsorted/additional_interface_adds_optional_args_concrete_test.dart
similarity index 100%
rename from tests/language_2/additional_interface_adds_optional_args_concrete_test.dart
rename to tests/language_2/unsorted/additional_interface_adds_optional_args_concrete_test.dart
diff --git a/tests/language_2/additional_interface_adds_optional_args_test.dart b/tests/language_2/unsorted/additional_interface_adds_optional_args_test.dart
similarity index 100%
rename from tests/language_2/additional_interface_adds_optional_args_test.dart
rename to tests/language_2/unsorted/additional_interface_adds_optional_args_test.dart
diff --git a/tests/language_2/allocate_large_object_test.dart b/tests/language_2/unsorted/allocate_large_object_test.dart
similarity index 100%
rename from tests/language_2/allocate_large_object_test.dart
rename to tests/language_2/unsorted/allocate_large_object_test.dart
diff --git a/tests/language_2/allocate_test.dart b/tests/language_2/unsorted/allocate_test.dart
similarity index 100%
rename from tests/language_2/allocate_test.dart
rename to tests/language_2/unsorted/allocate_test.dart
diff --git a/tests/language_2/arg_param_trailing_comma_test.dart b/tests/language_2/unsorted/arg_param_trailing_comma_test.dart
similarity index 100%
rename from tests/language_2/arg_param_trailing_comma_test.dart
rename to tests/language_2/unsorted/arg_param_trailing_comma_test.dart
diff --git a/tests/language_2/assignable_expression_runtime_test.dart b/tests/language_2/unsorted/assignable_expression_runtime_test.dart
similarity index 100%
rename from tests/language_2/assignable_expression_runtime_test.dart
rename to tests/language_2/unsorted/assignable_expression_runtime_test.dart
diff --git a/tests/language_2/assignable_expression_test.dart b/tests/language_2/unsorted/assignable_expression_test.dart
similarity index 100%
rename from tests/language_2/assignable_expression_test.dart
rename to tests/language_2/unsorted/assignable_expression_test.dart
diff --git a/tests/language_2/bad_override_runtime_test.dart b/tests/language_2/unsorted/bad_override_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_override_runtime_test.dart
rename to tests/language_2/unsorted/bad_override_runtime_test.dart
diff --git a/tests/language_2/bad_override_test.dart b/tests/language_2/unsorted/bad_override_test.dart
similarity index 100%
rename from tests/language_2/bad_override_test.dart
rename to tests/language_2/unsorted/bad_override_test.dart
diff --git a/tests/language_2/bind_test.dart b/tests/language_2/unsorted/bind_test.dart
similarity index 100%
rename from tests/language_2/bind_test.dart
rename to tests/language_2/unsorted/bind_test.dart
diff --git a/tests/language_2/black_listed_test.dart b/tests/language_2/unsorted/black_listed_test.dart
similarity index 100%
rename from tests/language_2/black_listed_test.dart
rename to tests/language_2/unsorted/black_listed_test.dart
diff --git a/tests/language_2/bootstrap_test.dart b/tests/language_2/unsorted/bootstrap_test.dart
similarity index 100%
rename from tests/language_2/bootstrap_test.dart
rename to tests/language_2/unsorted/bootstrap_test.dart
diff --git a/tests/language_2/bottom_test.dart b/tests/language_2/unsorted/bottom_test.dart
similarity index 100%
rename from tests/language_2/bottom_test.dart
rename to tests/language_2/unsorted/bottom_test.dart
diff --git a/tests/language_2/branch_canonicalization_test.dart b/tests/language_2/unsorted/branch_canonicalization_test.dart
similarity index 100%
rename from tests/language_2/branch_canonicalization_test.dart
rename to tests/language_2/unsorted/branch_canonicalization_test.dart
diff --git a/tests/language_2/branches_test.dart b/tests/language_2/unsorted/branches_test.dart
similarity index 100%
rename from tests/language_2/branches_test.dart
rename to tests/language_2/unsorted/branches_test.dart
diff --git a/tests/language_2/callable_runtime_test.dart b/tests/language_2/unsorted/callable_runtime_test.dart
similarity index 100%
rename from tests/language_2/callable_runtime_test.dart
rename to tests/language_2/unsorted/callable_runtime_test.dart
diff --git a/tests/language_2/callable_test.dart b/tests/language_2/unsorted/callable_test.dart
similarity index 100%
rename from tests/language_2/callable_test.dart
rename to tests/language_2/unsorted/callable_test.dart
diff --git a/tests/language_2/cascaded_forwarding_stubs_test.dart b/tests/language_2/unsorted/cascaded_forwarding_stubs_test.dart
similarity index 100%
rename from tests/language_2/cascaded_forwarding_stubs_test.dart
rename to tests/language_2/unsorted/cascaded_forwarding_stubs_test.dart
diff --git a/tests/language_2/cast2_test.dart b/tests/language_2/unsorted/cast2_test.dart
similarity index 100%
rename from tests/language_2/cast2_test.dart
rename to tests/language_2/unsorted/cast2_test.dart
diff --git a/tests/language_2/cast_test.dart b/tests/language_2/unsorted/cast_test.dart
similarity index 100%
rename from tests/language_2/cast_test.dart
rename to tests/language_2/unsorted/cast_test.dart
diff --git a/tests/language_2/check_member_static_runtime_1_test.dart b/tests/language_2/unsorted/check_member_static_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/check_member_static_runtime_1_test.dart
rename to tests/language_2/unsorted/check_member_static_runtime_1_test.dart
diff --git a/tests/language_2/check_member_static_runtime_test.dart b/tests/language_2/unsorted/check_member_static_runtime_test.dart
similarity index 100%
rename from tests/language_2/check_member_static_runtime_test.dart
rename to tests/language_2/unsorted/check_member_static_runtime_test.dart
diff --git a/tests/language_2/check_member_static_test.dart b/tests/language_2/unsorted/check_member_static_test.dart
similarity index 100%
rename from tests/language_2/check_member_static_test.dart
rename to tests/language_2/unsorted/check_member_static_test.dart
diff --git a/tests/language_2/check_method_override_runtime_test.dart b/tests/language_2/unsorted/check_method_override_runtime_test.dart
similarity index 100%
rename from tests/language_2/check_method_override_runtime_test.dart
rename to tests/language_2/unsorted/check_method_override_runtime_test.dart
diff --git a/tests/language_2/check_method_override_test.dart b/tests/language_2/unsorted/check_method_override_test.dart
similarity index 100%
rename from tests/language_2/check_method_override_test.dart
rename to tests/language_2/unsorted/check_method_override_test.dart
diff --git a/tests/language_2/checked_method_error_order_test.dart b/tests/language_2/unsorted/checked_method_error_order_test.dart
similarity index 100%
rename from tests/language_2/checked_method_error_order_test.dart
rename to tests/language_2/unsorted/checked_method_error_order_test.dart
diff --git a/tests/language_2/combiner_type_lookup_indexed_test.dart b/tests/language_2/unsorted/combiner_type_lookup_indexed_test.dart
similarity index 100%
rename from tests/language_2/combiner_type_lookup_indexed_test.dart
rename to tests/language_2/unsorted/combiner_type_lookup_indexed_test.dart
diff --git a/tests/language_2/combiner_type_lookup_instance_test.dart b/tests/language_2/unsorted/combiner_type_lookup_instance_test.dart
similarity index 100%
rename from tests/language_2/combiner_type_lookup_instance_test.dart
rename to tests/language_2/unsorted/combiner_type_lookup_instance_test.dart
diff --git a/tests/language_2/combiner_type_lookup_static_test.dart b/tests/language_2/unsorted/combiner_type_lookup_static_test.dart
similarity index 100%
rename from tests/language_2/combiner_type_lookup_static_test.dart
rename to tests/language_2/unsorted/combiner_type_lookup_static_test.dart
diff --git a/tests/language_2/combiner_type_lookup_top_level_test.dart b/tests/language_2/unsorted/combiner_type_lookup_top_level_test.dart
similarity index 100%
rename from tests/language_2/combiner_type_lookup_top_level_test.dart
rename to tests/language_2/unsorted/combiner_type_lookup_top_level_test.dart
diff --git a/tests/language_2/condition_bailout_test.dart b/tests/language_2/unsorted/condition_bailout_test.dart
similarity index 100%
rename from tests/language_2/condition_bailout_test.dart
rename to tests/language_2/unsorted/condition_bailout_test.dart
diff --git a/tests/language_2/context2_test.dart b/tests/language_2/unsorted/context2_test.dart
similarity index 100%
rename from tests/language_2/context2_test.dart
rename to tests/language_2/unsorted/context2_test.dart
diff --git a/tests/language_2/context_args_with_defaults_test.dart b/tests/language_2/unsorted/context_args_with_defaults_test.dart
similarity index 100%
rename from tests/language_2/context_args_with_defaults_test.dart
rename to tests/language_2/unsorted/context_args_with_defaults_test.dart
diff --git a/tests/language_2/context_test.dart b/tests/language_2/unsorted/context_test.dart
similarity index 100%
rename from tests/language_2/context_test.dart
rename to tests/language_2/unsorted/context_test.dart
diff --git a/tests/language_2/core_type_check_test.dart b/tests/language_2/unsorted/core_type_check_test.dart
similarity index 100%
rename from tests/language_2/core_type_check_test.dart
rename to tests/language_2/unsorted/core_type_check_test.dart
diff --git a/tests/language_2/cyclic_default_values_test.dart b/tests/language_2/unsorted/cyclic_default_values_test.dart
similarity index 100%
rename from tests/language_2/cyclic_default_values_test.dart
rename to tests/language_2/unsorted/cyclic_default_values_test.dart
diff --git a/tests/language_2/cyclic_type2_test.dart b/tests/language_2/unsorted/cyclic_type2_test.dart
similarity index 100%
rename from tests/language_2/cyclic_type2_test.dart
rename to tests/language_2/unsorted/cyclic_type2_test.dart
diff --git a/tests/language_2/cyclic_type_test.dart b/tests/language_2/unsorted/cyclic_type_test.dart
similarity index 100%
rename from tests/language_2/cyclic_type_test.dart
rename to tests/language_2/unsorted/cyclic_type_test.dart
diff --git a/tests/language_2/default_implementation2_test.dart b/tests/language_2/unsorted/default_implementation2_test.dart
similarity index 100%
rename from tests/language_2/default_implementation2_test.dart
rename to tests/language_2/unsorted/default_implementation2_test.dart
diff --git a/tests/language_2/default_implementation_test.dart b/tests/language_2/unsorted/default_implementation_test.dart
similarity index 100%
rename from tests/language_2/default_implementation_test.dart
rename to tests/language_2/unsorted/default_implementation_test.dart
diff --git a/tests/language_2/default_init_test.dart b/tests/language_2/unsorted/default_init_test.dart
similarity index 100%
rename from tests/language_2/default_init_test.dart
rename to tests/language_2/unsorted/default_init_test.dart
diff --git a/tests/language_2/disassemble_test.dart b/tests/language_2/unsorted/disassemble_test.dart
similarity index 100%
rename from tests/language_2/disassemble_test.dart
rename to tests/language_2/unsorted/disassemble_test.dart
diff --git a/tests/language_2/efficient_length_warning_test.dart b/tests/language_2/unsorted/efficient_length_warning_test.dart
similarity index 100%
rename from tests/language_2/efficient_length_warning_test.dart
rename to tests/language_2/unsorted/efficient_length_warning_test.dart
diff --git a/tests/language_2/emit_const_fields_test.dart b/tests/language_2/unsorted/emit_const_fields_test.dart
similarity index 100%
rename from tests/language_2/emit_const_fields_test.dart
rename to tests/language_2/unsorted/emit_const_fields_test.dart
diff --git a/tests/language_2/expect_test.dart b/tests/language_2/unsorted/expect_test.dart
similarity index 100%
rename from tests/language_2/expect_test.dart
rename to tests/language_2/unsorted/expect_test.dart
diff --git a/tests/language_2/extend_type_parameter_test.dart b/tests/language_2/unsorted/extend_type_parameter_test.dart
similarity index 100%
rename from tests/language_2/extend_type_parameter_test.dart
rename to tests/language_2/unsorted/extend_type_parameter_test.dart
diff --git a/tests/language_2/extends_test.dart b/tests/language_2/unsorted/extends_test.dart
similarity index 100%
rename from tests/language_2/extends_test.dart
rename to tests/language_2/unsorted/extends_test.dart
diff --git a/tests/language_2/extends_test_lib.dart b/tests/language_2/unsorted/extends_test_lib.dart
similarity index 100%
rename from tests/language_2/extends_test_lib.dart
rename to tests/language_2/unsorted/extends_test_lib.dart
diff --git a/tests/language_2/external_runtime_test.dart b/tests/language_2/unsorted/external_runtime_test.dart
similarity index 100%
rename from tests/language_2/external_runtime_test.dart
rename to tests/language_2/unsorted/external_runtime_test.dart
diff --git a/tests/language_2/external_test.dart b/tests/language_2/unsorted/external_test.dart
similarity index 100%
rename from tests/language_2/external_test.dart
rename to tests/language_2/unsorted/external_test.dart
diff --git a/tests/language_2/extract_type_arguments_test.dart b/tests/language_2/unsorted/extract_type_arguments_test.dart
similarity index 100%
rename from tests/language_2/extract_type_arguments_test.dart
rename to tests/language_2/unsorted/extract_type_arguments_test.dart
diff --git a/tests/language_2/fannkuch_test.dart b/tests/language_2/unsorted/fannkuch_test.dart
similarity index 100%
rename from tests/language_2/fannkuch_test.dart
rename to tests/language_2/unsorted/fannkuch_test.dart
diff --git a/tests/language_2/fast_method_extraction_test.dart b/tests/language_2/unsorted/fast_method_extraction_test.dart
similarity index 100%
rename from tests/language_2/fast_method_extraction_test.dart
rename to tests/language_2/unsorted/fast_method_extraction_test.dart
diff --git a/tests/language_2/fauxverride_runtime_test.dart b/tests/language_2/unsorted/fauxverride_runtime_test.dart
similarity index 100%
rename from tests/language_2/fauxverride_runtime_test.dart
rename to tests/language_2/unsorted/fauxverride_runtime_test.dart
diff --git a/tests/language_2/fauxverride_test.dart b/tests/language_2/unsorted/fauxverride_test.dart
similarity index 100%
rename from tests/language_2/fauxverride_test.dart
rename to tests/language_2/unsorted/fauxverride_test.dart
diff --git a/tests/language_2/fibo_test.dart b/tests/language_2/unsorted/fibo_test.dart
similarity index 100%
rename from tests/language_2/fibo_test.dart
rename to tests/language_2/unsorted/fibo_test.dart
diff --git a/tests/language_2/first_test.dart b/tests/language_2/unsorted/first_test.dart
similarity index 100%
rename from tests/language_2/first_test.dart
rename to tests/language_2/unsorted/first_test.dart
diff --git a/tests/language_2/fixed_length_test.dart b/tests/language_2/unsorted/fixed_length_test.dart
similarity index 100%
rename from tests/language_2/fixed_length_test.dart
rename to tests/language_2/unsorted/fixed_length_test.dart
diff --git a/tests/language_2/flatten_test.dart b/tests/language_2/unsorted/flatten_test.dart
similarity index 100%
rename from tests/language_2/flatten_test.dart
rename to tests/language_2/unsorted/flatten_test.dart
diff --git a/tests/language_2/forwarding_semi_stub_test.dart b/tests/language_2/unsorted/forwarding_semi_stub_test.dart
similarity index 100%
rename from tests/language_2/forwarding_semi_stub_test.dart
rename to tests/language_2/unsorted/forwarding_semi_stub_test.dart
diff --git a/tests/language_2/future_or_function_test.dart b/tests/language_2/unsorted/future_or_function_test.dart
similarity index 100%
rename from tests/language_2/future_or_function_test.dart
rename to tests/language_2/unsorted/future_or_function_test.dart
diff --git a/tests/language_2/fuzzy_arrows_test.dart b/tests/language_2/unsorted/fuzzy_arrows_test.dart
similarity index 100%
rename from tests/language_2/fuzzy_arrows_test.dart
rename to tests/language_2/unsorted/fuzzy_arrows_test.dart
diff --git a/tests/language_2/gc_test.dart b/tests/language_2/unsorted/gc_test.dart
similarity index 100%
rename from tests/language_2/gc_test.dart
rename to tests/language_2/unsorted/gc_test.dart
diff --git a/tests/language_2/guess_cid_test.dart b/tests/language_2/unsorted/guess_cid_test.dart
similarity index 100%
rename from tests/language_2/guess_cid_test.dart
rename to tests/language_2/unsorted/guess_cid_test.dart
diff --git a/tests/language_2/gvn_field_access_test.dart b/tests/language_2/unsorted/gvn_field_access_test.dart
similarity index 100%
rename from tests/language_2/gvn_field_access_test.dart
rename to tests/language_2/unsorted/gvn_field_access_test.dart
diff --git a/tests/language_2/gvn_interceptor_test.dart b/tests/language_2/unsorted/gvn_interceptor_test.dart
similarity index 100%
rename from tests/language_2/gvn_interceptor_test.dart
rename to tests/language_2/unsorted/gvn_interceptor_test.dart
diff --git a/tests/language_2/gvn_test.dart b/tests/language_2/unsorted/gvn_test.dart
similarity index 100%
rename from tests/language_2/gvn_test.dart
rename to tests/language_2/unsorted/gvn_test.dart
diff --git a/tests/language_2/hash_code_mangling_test.dart b/tests/language_2/unsorted/hash_code_mangling_test.dart
similarity index 100%
rename from tests/language_2/hash_code_mangling_test.dart
rename to tests/language_2/unsorted/hash_code_mangling_test.dart
diff --git a/tests/language_2/hello_dart_test.dart b/tests/language_2/unsorted/hello_dart_test.dart
similarity index 100%
rename from tests/language_2/hello_dart_test.dart
rename to tests/language_2/unsorted/hello_dart_test.dart
diff --git a/tests/language_2/hello_script_lib.dart b/tests/language_2/unsorted/hello_script_lib.dart
similarity index 100%
rename from tests/language_2/hello_script_lib.dart
rename to tests/language_2/unsorted/hello_script_lib.dart
diff --git a/tests/language_2/hello_script_lib_source.dart b/tests/language_2/unsorted/hello_script_lib_source.dart
similarity index 100%
rename from tests/language_2/hello_script_lib_source.dart
rename to tests/language_2/unsorted/hello_script_lib_source.dart
diff --git a/tests/language_2/hello_script_test.dart b/tests/language_2/unsorted/hello_script_test.dart
similarity index 100%
rename from tests/language_2/hello_script_test.dart
rename to tests/language_2/unsorted/hello_script_test.dart
diff --git a/tests/language_2/illegal_declaration_test.dart b/tests/language_2/unsorted/illegal_declaration_test.dart
similarity index 100%
rename from tests/language_2/illegal_declaration_test.dart
rename to tests/language_2/unsorted/illegal_declaration_test.dart
diff --git a/tests/language_2/illegal_invocation_lib.dart b/tests/language_2/unsorted/illegal_invocation_lib.dart
similarity index 100%
rename from tests/language_2/illegal_invocation_lib.dart
rename to tests/language_2/unsorted/illegal_invocation_lib.dart
diff --git a/tests/language_2/illegal_invocation_runtime_test.dart b/tests/language_2/unsorted/illegal_invocation_runtime_test.dart
similarity index 100%
rename from tests/language_2/illegal_invocation_runtime_test.dart
rename to tests/language_2/unsorted/illegal_invocation_runtime_test.dart
diff --git a/tests/language_2/illegal_invocation_test.dart b/tests/language_2/unsorted/illegal_invocation_test.dart
similarity index 100%
rename from tests/language_2/illegal_invocation_test.dart
rename to tests/language_2/unsorted/illegal_invocation_test.dart
diff --git a/tests/language_2/implicit_scope_test.dart b/tests/language_2/unsorted/implicit_scope_test.dart
similarity index 100%
rename from tests/language_2/implicit_scope_test.dart
rename to tests/language_2/unsorted/implicit_scope_test.dart
diff --git a/tests/language_2/index_assign_operator_infer_return_type_test.dart b/tests/language_2/unsorted/index_assign_operator_infer_return_type_test.dart
similarity index 100%
rename from tests/language_2/index_assign_operator_infer_return_type_test.dart
rename to tests/language_2/unsorted/index_assign_operator_infer_return_type_test.dart
diff --git a/tests/language_2/indirect_const_null_test.dart b/tests/language_2/unsorted/indirect_const_null_test.dart
similarity index 100%
rename from tests/language_2/indirect_const_null_test.dart
rename to tests/language_2/unsorted/indirect_const_null_test.dart
diff --git a/tests/language_2/inference_enum_list_test.dart b/tests/language_2/unsorted/inference_enum_list_test.dart
similarity index 100%
rename from tests/language_2/inference_enum_list_test.dart
rename to tests/language_2/unsorted/inference_enum_list_test.dart
diff --git a/tests/language_2/inference_list_or_null_test.dart b/tests/language_2/unsorted/inference_list_or_null_test.dart
similarity index 100%
rename from tests/language_2/inference_list_or_null_test.dart
rename to tests/language_2/unsorted/inference_list_or_null_test.dart
diff --git a/tests/language_2/intrinsified_methods_test.dart b/tests/language_2/unsorted/intrinsified_methods_test.dart
similarity index 100%
rename from tests/language_2/intrinsified_methods_test.dart
rename to tests/language_2/unsorted/intrinsified_methods_test.dart
diff --git a/tests/language_2/inv_cse_licm_test.dart b/tests/language_2/unsorted/inv_cse_licm_test.dart
similarity index 100%
rename from tests/language_2/inv_cse_licm_test.dart
rename to tests/language_2/unsorted/inv_cse_licm_test.dart
diff --git a/tests/language_2/invalid_cast_runtime_1_test.dart b/tests/language_2/unsorted/invalid_cast_runtime_1_test.dart
similarity index 100%
rename from tests/language_2/invalid_cast_runtime_1_test.dart
rename to tests/language_2/unsorted/invalid_cast_runtime_1_test.dart
diff --git a/tests/language_2/invalid_cast_runtime_2_test.dart b/tests/language_2/unsorted/invalid_cast_runtime_2_test.dart
similarity index 100%
rename from tests/language_2/invalid_cast_runtime_2_test.dart
rename to tests/language_2/unsorted/invalid_cast_runtime_2_test.dart
diff --git a/tests/language_2/invalid_cast_runtime_test.dart b/tests/language_2/unsorted/invalid_cast_runtime_test.dart
similarity index 100%
rename from tests/language_2/invalid_cast_runtime_test.dart
rename to tests/language_2/unsorted/invalid_cast_runtime_test.dart
diff --git a/tests/language_2/invalid_cast_test.dart b/tests/language_2/unsorted/invalid_cast_test.dart
similarity index 100%
rename from tests/language_2/invalid_cast_test.dart
rename to tests/language_2/unsorted/invalid_cast_test.dart
diff --git a/tests/language_2/invalid_type_argument_count_runtime_test.dart b/tests/language_2/unsorted/invalid_type_argument_count_runtime_test.dart
similarity index 100%
rename from tests/language_2/invalid_type_argument_count_runtime_test.dart
rename to tests/language_2/unsorted/invalid_type_argument_count_runtime_test.dart
diff --git a/tests/language_2/invalid_type_argument_count_test.dart b/tests/language_2/unsorted/invalid_type_argument_count_test.dart
similarity index 100%
rename from tests/language_2/invalid_type_argument_count_test.dart
rename to tests/language_2/unsorted/invalid_type_argument_count_test.dart
diff --git a/tests/language_2/invocation_mirror2_test.dart b/tests/language_2/unsorted/invocation_mirror2_test.dart
similarity index 100%
rename from tests/language_2/invocation_mirror2_test.dart
rename to tests/language_2/unsorted/invocation_mirror2_test.dart
diff --git a/tests/language_2/invocation_mirror_empty_arguments_test.dart b/tests/language_2/unsorted/invocation_mirror_empty_arguments_test.dart
similarity index 100%
rename from tests/language_2/invocation_mirror_empty_arguments_test.dart
rename to tests/language_2/unsorted/invocation_mirror_empty_arguments_test.dart
diff --git a/tests/language_2/invocation_mirror_test.dart b/tests/language_2/unsorted/invocation_mirror_test.dart
similarity index 100%
rename from tests/language_2/invocation_mirror_test.dart
rename to tests/language_2/unsorted/invocation_mirror_test.dart
diff --git a/tests/language_2/js_properties_test.dart b/tests/language_2/unsorted/js_properties_test.dart
similarity index 100%
rename from tests/language_2/js_properties_test.dart
rename to tests/language_2/unsorted/js_properties_test.dart
diff --git a/tests/language_2/keyword_type_expression_test.dart b/tests/language_2/unsorted/keyword_type_expression_test.dart
similarity index 100%
rename from tests/language_2/keyword_type_expression_test.dart
rename to tests/language_2/unsorted/keyword_type_expression_test.dart
diff --git a/tests/language_2/large_implicit_getter_test.dart b/tests/language_2/unsorted/large_implicit_getter_test.dart
similarity index 100%
rename from tests/language_2/large_implicit_getter_test.dart
rename to tests/language_2/unsorted/large_implicit_getter_test.dart
diff --git a/tests/language_2/larger_implicit_getter_test.dart b/tests/language_2/unsorted/larger_implicit_getter_test.dart
similarity index 100%
rename from tests/language_2/larger_implicit_getter_test.dart
rename to tests/language_2/unsorted/larger_implicit_getter_test.dart
diff --git a/tests/language_2/liveness_test.dart b/tests/language_2/unsorted/liveness_test.dart
similarity index 100%
rename from tests/language_2/liveness_test.dart
rename to tests/language_2/unsorted/liveness_test.dart
diff --git a/tests/language_2/load_indexed_constant_test.dart b/tests/language_2/unsorted/load_indexed_constant_test.dart
similarity index 100%
rename from tests/language_2/load_indexed_constant_test.dart
rename to tests/language_2/unsorted/load_indexed_constant_test.dart
diff --git a/tests/language_2/local_var_in_annotation_test.dart b/tests/language_2/unsorted/local_var_in_annotation_test.dart
similarity index 100%
rename from tests/language_2/local_var_in_annotation_test.dart
rename to tests/language_2/unsorted/local_var_in_annotation_test.dart
diff --git a/tests/language_2/many_calls_test.dart b/tests/language_2/unsorted/many_calls_test.dart
similarity index 100%
rename from tests/language_2/many_calls_test.dart
rename to tests/language_2/unsorted/many_calls_test.dart
diff --git a/tests/language_2/many_method_calls_test.dart b/tests/language_2/unsorted/many_method_calls_test.dart
similarity index 100%
rename from tests/language_2/many_method_calls_test.dart
rename to tests/language_2/unsorted/many_method_calls_test.dart
diff --git a/tests/language_2/many_named_arguments_test.dart b/tests/language_2/unsorted/many_named_arguments_test.dart
similarity index 100%
rename from tests/language_2/many_named_arguments_test.dart
rename to tests/language_2/unsorted/many_named_arguments_test.dart
diff --git a/tests/language_2/mega_load_test.dart b/tests/language_2/unsorted/mega_load_test.dart
similarity index 100%
rename from tests/language_2/mega_load_test.dart
rename to tests/language_2/unsorted/mega_load_test.dart
diff --git a/tests/language_2/memory_swap_test.dart b/tests/language_2/unsorted/memory_swap_test.dart
similarity index 100%
rename from tests/language_2/memory_swap_test.dart
rename to tests/language_2/unsorted/memory_swap_test.dart
diff --git a/tests/language_2/mint_compares_test.dart b/tests/language_2/unsorted/mint_compares_test.dart
similarity index 100%
rename from tests/language_2/mint_compares_test.dart
rename to tests/language_2/unsorted/mint_compares_test.dart
diff --git a/tests/language_2/mock_writable_final_field_test.dart b/tests/language_2/unsorted/mock_writable_final_field_test.dart
similarity index 100%
rename from tests/language_2/mock_writable_final_field_test.dart
rename to tests/language_2/unsorted/mock_writable_final_field_test.dart
diff --git a/tests/language_2/multi_pass2_test.dart b/tests/language_2/unsorted/multi_pass2_test.dart
similarity index 100%
rename from tests/language_2/multi_pass2_test.dart
rename to tests/language_2/unsorted/multi_pass2_test.dart
diff --git a/tests/language_2/multi_pass_a.dart b/tests/language_2/unsorted/multi_pass_a.dart
similarity index 100%
rename from tests/language_2/multi_pass_a.dart
rename to tests/language_2/unsorted/multi_pass_a.dart
diff --git a/tests/language_2/multi_pass_b.dart b/tests/language_2/unsorted/multi_pass_b.dart
similarity index 100%
rename from tests/language_2/multi_pass_b.dart
rename to tests/language_2/unsorted/multi_pass_b.dart
diff --git a/tests/language_2/multi_pass_test.dart b/tests/language_2/unsorted/multi_pass_test.dart
similarity index 100%
rename from tests/language_2/multi_pass_test.dart
rename to tests/language_2/unsorted/multi_pass_test.dart
diff --git a/tests/language_2/namer2_test.dart b/tests/language_2/unsorted/namer2_test.dart
similarity index 100%
rename from tests/language_2/namer2_test.dart
rename to tests/language_2/unsorted/namer2_test.dart
diff --git a/tests/language_2/namer_test.dart b/tests/language_2/unsorted/namer_test.dart
similarity index 100%
rename from tests/language_2/namer_test.dart
rename to tests/language_2/unsorted/namer_test.dart
diff --git a/tests/language_2/native_test.dart b/tests/language_2/unsorted/native_test.dart
similarity index 100%
rename from tests/language_2/native_test.dart
rename to tests/language_2/unsorted/native_test.dart
diff --git a/tests/language_2/parse_types_test.dart b/tests/language_2/unsorted/parse_types_test.dart
similarity index 100%
rename from tests/language_2/parse_types_test.dart
rename to tests/language_2/unsorted/parse_types_test.dart
diff --git a/tests/language_2/partial_min_test.dart b/tests/language_2/unsorted/partial_min_test.dart
similarity index 100%
rename from tests/language_2/partial_min_test.dart
rename to tests/language_2/unsorted/partial_min_test.dart
diff --git a/tests/language_2/patch_test.dart b/tests/language_2/unsorted/patch_test.dart
similarity index 100%
rename from tests/language_2/patch_test.dart
rename to tests/language_2/unsorted/patch_test.dart
diff --git a/tests/language_2/property_field_override_test.dart b/tests/language_2/unsorted/property_field_override_test.dart
similarity index 100%
rename from tests/language_2/property_field_override_test.dart
rename to tests/language_2/unsorted/property_field_override_test.dart
diff --git a/tests/language_2/range_analysis2_test.dart b/tests/language_2/unsorted/range_analysis2_test.dart
similarity index 100%
rename from tests/language_2/range_analysis2_test.dart
rename to tests/language_2/unsorted/range_analysis2_test.dart
diff --git a/tests/language_2/range_analysis3_test.dart b/tests/language_2/unsorted/range_analysis3_test.dart
similarity index 100%
rename from tests/language_2/range_analysis3_test.dart
rename to tests/language_2/unsorted/range_analysis3_test.dart
diff --git a/tests/language_2/range_analysis_test.dart b/tests/language_2/unsorted/range_analysis_test.dart
similarity index 100%
rename from tests/language_2/range_analysis_test.dart
rename to tests/language_2/unsorted/range_analysis_test.dart
diff --git a/tests/language_2/recursive_calls_test.dart b/tests/language_2/unsorted/recursive_calls_test.dart
similarity index 100%
rename from tests/language_2/recursive_calls_test.dart
rename to tests/language_2/unsorted/recursive_calls_test.dart
diff --git a/tests/language_2/recursive_loop_phis_test.dart b/tests/language_2/unsorted/recursive_loop_phis_test.dart
similarity index 100%
rename from tests/language_2/recursive_loop_phis_test.dart
rename to tests/language_2/unsorted/recursive_loop_phis_test.dart
diff --git a/tests/language_2/refine_receiver_null_test.dart b/tests/language_2/unsorted/refine_receiver_null_test.dart
similarity index 93%
rename from tests/language_2/refine_receiver_null_test.dart
rename to tests/language_2/unsorted/refine_receiver_null_test.dart
index d041f2139ea..499e99839ba 100644
--- a/tests/language_2/refine_receiver_null_test.dart
+++ b/tests/language_2/unsorted/refine_receiver_null_test.dart
@@ -7,7 +7,7 @@
 // work for Object methods.
 
 import "package:expect/expect.dart";
-import "compiler_annotations.dart";
+import "../compiler_annotations.dart";
 
 main() {
   var a = true ? null : 42;
diff --git a/tests/language_2/savannah_test.dart b/tests/language_2/unsorted/savannah_test.dart
similarity index 100%
rename from tests/language_2/savannah_test.dart
rename to tests/language_2/unsorted/savannah_test.dart
diff --git a/tests/language_2/scanner_test.dart b/tests/language_2/unsorted/scanner_test.dart
similarity index 100%
rename from tests/language_2/scanner_test.dart
rename to tests/language_2/unsorted/scanner_test.dart
diff --git a/tests/language_2/second_test.dart b/tests/language_2/unsorted/second_test.dart
similarity index 100%
rename from tests/language_2/second_test.dart
rename to tests/language_2/unsorted/second_test.dart
diff --git a/tests/language_2/shadow_parameter_and_local_test.dart b/tests/language_2/unsorted/shadow_parameter_and_local_test.dart
similarity index 100%
rename from tests/language_2/shadow_parameter_and_local_test.dart
rename to tests/language_2/unsorted/shadow_parameter_and_local_test.dart
diff --git a/tests/language_2/side_effect_throw_test.dart b/tests/language_2/unsorted/side_effect_throw_test.dart
similarity index 100%
rename from tests/language_2/side_effect_throw_test.dart
rename to tests/language_2/unsorted/side_effect_throw_test.dart
diff --git a/tests/language_2/smaller_4_Interface_Types_A11_t01_test.dart b/tests/language_2/unsorted/smaller_4_Interface_Types_A11_t01_test.dart
similarity index 100%
rename from tests/language_2/smaller_4_Interface_Types_A11_t01_test.dart
rename to tests/language_2/unsorted/smaller_4_Interface_Types_A11_t01_test.dart
diff --git a/tests/language_2/smaller_4_Interface_Types_A11_t02_test.dart b/tests/language_2/unsorted/smaller_4_Interface_Types_A11_t02_test.dart
similarity index 100%
rename from tests/language_2/smaller_4_Interface_Types_A11_t02_test.dart
rename to tests/language_2/unsorted/smaller_4_Interface_Types_A11_t02_test.dart
diff --git a/tests/language_2/stack_overflow_stacktrace_test.dart b/tests/language_2/unsorted/stack_overflow_stacktrace_test.dart
similarity index 100%
rename from tests/language_2/stack_overflow_stacktrace_test.dart
rename to tests/language_2/unsorted/stack_overflow_stacktrace_test.dart
diff --git a/tests/language_2/stack_overflow_test.dart b/tests/language_2/unsorted/stack_overflow_test.dart
similarity index 100%
rename from tests/language_2/stack_overflow_test.dart
rename to tests/language_2/unsorted/stack_overflow_test.dart
diff --git a/tests/language_2/state_mangling2_test.dart b/tests/language_2/unsorted/state_mangling2_test.dart
similarity index 100%
rename from tests/language_2/state_mangling2_test.dart
rename to tests/language_2/unsorted/state_mangling2_test.dart
diff --git a/tests/language_2/state_mangling3_test.dart b/tests/language_2/unsorted/state_mangling3_test.dart
similarity index 100%
rename from tests/language_2/state_mangling3_test.dart
rename to tests/language_2/unsorted/state_mangling3_test.dart
diff --git a/tests/language_2/state_mangling4_test.dart b/tests/language_2/unsorted/state_mangling4_test.dart
similarity index 100%
rename from tests/language_2/state_mangling4_test.dart
rename to tests/language_2/unsorted/state_mangling4_test.dart
diff --git a/tests/language_2/state_mangling_test.dart b/tests/language_2/unsorted/state_mangling_test.dart
similarity index 100%
rename from tests/language_2/state_mangling_test.dart
rename to tests/language_2/unsorted/state_mangling_test.dart
diff --git a/tests/language_2/temp_mangling_test.dart b/tests/language_2/unsorted/temp_mangling_test.dart
similarity index 100%
rename from tests/language_2/temp_mangling_test.dart
rename to tests/language_2/unsorted/temp_mangling_test.dart
diff --git a/tests/language_2/third_test.dart b/tests/language_2/unsorted/third_test.dart
similarity index 100%
rename from tests/language_2/third_test.dart
rename to tests/language_2/unsorted/third_test.dart
diff --git a/tests/language_2/tree_shake_typed_selector_test.dart b/tests/language_2/unsorted/tree_shake_typed_selector_test.dart
similarity index 100%
rename from tests/language_2/tree_shake_typed_selector_test.dart
rename to tests/language_2/unsorted/tree_shake_typed_selector_test.dart
diff --git a/tests/language_2/typecheck_multifield_declaration_test.dart b/tests/language_2/unsorted/typecheck_multifield_declaration_test.dart
similarity index 100%
rename from tests/language_2/typecheck_multifield_declaration_test.dart
rename to tests/language_2/unsorted/typecheck_multifield_declaration_test.dart
diff --git a/tests/language_2/typed_equality_test.dart b/tests/language_2/unsorted/typed_equality_test.dart
similarity index 100%
rename from tests/language_2/typed_equality_test.dart
rename to tests/language_2/unsorted/typed_equality_test.dart
diff --git a/tests/language_2/typed_selector2_test.dart b/tests/language_2/unsorted/typed_selector2_test.dart
similarity index 100%
rename from tests/language_2/typed_selector2_test.dart
rename to tests/language_2/unsorted/typed_selector2_test.dart
diff --git a/tests/language_2/typed_selector_test.dart b/tests/language_2/unsorted/typed_selector_test.dart
similarity index 100%
rename from tests/language_2/typed_selector_test.dart
rename to tests/language_2/unsorted/typed_selector_test.dart
diff --git a/tests/language_2/unevaluated_field.dart b/tests/language_2/unsorted/unevaluated_field.dart
similarity index 100%
rename from tests/language_2/unevaluated_field.dart
rename to tests/language_2/unsorted/unevaluated_field.dart
diff --git a/tests/language_2/unused_overridden_async_test.dart b/tests/language_2/unsorted/unused_overridden_async_test.dart
similarity index 100%
rename from tests/language_2/unused_overridden_async_test.dart
rename to tests/language_2/unsorted/unused_overridden_async_test.dart
diff --git a/tests/language_2/value_range2_test.dart b/tests/language_2/unsorted/value_range2_test.dart
similarity index 100%
rename from tests/language_2/value_range2_test.dart
rename to tests/language_2/unsorted/value_range2_test.dart
diff --git a/tests/language_2/value_range3_test.dart b/tests/language_2/unsorted/value_range3_test.dart
similarity index 100%
rename from tests/language_2/value_range3_test.dart
rename to tests/language_2/unsorted/value_range3_test.dart
diff --git a/tests/language_2/value_range_test.dart b/tests/language_2/unsorted/value_range_test.dart
similarity index 100%
rename from tests/language_2/value_range_test.dart
rename to tests/language_2/unsorted/value_range_test.dart
diff --git a/tests/language_2/var_init_test.dart b/tests/language_2/unsorted/var_init_test.dart
similarity index 100%
rename from tests/language_2/var_init_test.dart
rename to tests/language_2/unsorted/var_init_test.dart
diff --git a/tests/language_2/bad_initializer1_runtime_test.dart b/tests/language_2/variable/bad_initializer1_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_initializer1_runtime_test.dart
rename to tests/language_2/variable/bad_initializer1_runtime_test.dart
diff --git a/tests/language_2/bad_initializer1_test.dart b/tests/language_2/variable/bad_initializer1_test.dart
similarity index 100%
rename from tests/language_2/bad_initializer1_test.dart
rename to tests/language_2/variable/bad_initializer1_test.dart
diff --git a/tests/language_2/bad_initializer2_runtime_test.dart b/tests/language_2/variable/bad_initializer2_runtime_test.dart
similarity index 100%
rename from tests/language_2/bad_initializer2_runtime_test.dart
rename to tests/language_2/variable/bad_initializer2_runtime_test.dart
diff --git a/tests/language_2/bad_initializer2_test.dart b/tests/language_2/variable/bad_initializer2_test.dart
similarity index 100%
rename from tests/language_2/bad_initializer2_test.dart
rename to tests/language_2/variable/bad_initializer2_test.dart
diff --git a/tests/language_2/conflicting_type_variable_and_setter_test.dart b/tests/language_2/variable/conflicting_type_variable_and_setter_test.dart
similarity index 100%
rename from tests/language_2/conflicting_type_variable_and_setter_test.dart
rename to tests/language_2/variable/conflicting_type_variable_and_setter_test.dart
diff --git a/tests/language_2/cyclic_type_variable_test.dart b/tests/language_2/variable/cyclic_type_variable_test.dart
similarity index 100%
rename from tests/language_2/cyclic_type_variable_test.dart
rename to tests/language_2/variable/cyclic_type_variable_test.dart
diff --git a/tests/language_2/duplicate_field_with_initializer_runtime_test.dart b/tests/language_2/variable/duplicate_field_with_initializer_runtime_test.dart
similarity index 100%
rename from tests/language_2/duplicate_field_with_initializer_runtime_test.dart
rename to tests/language_2/variable/duplicate_field_with_initializer_runtime_test.dart
diff --git a/tests/language_2/duplicate_field_with_initializer_test.dart b/tests/language_2/variable/duplicate_field_with_initializer_test.dart
similarity index 100%
rename from tests/language_2/duplicate_field_with_initializer_test.dart
rename to tests/language_2/variable/duplicate_field_with_initializer_test.dart
diff --git a/tests/language_2/fixed_type_variable2_test.dart b/tests/language_2/variable/fixed_type_variable2_test.dart
similarity index 100%
rename from tests/language_2/fixed_type_variable2_test.dart
rename to tests/language_2/variable/fixed_type_variable2_test.dart
diff --git a/tests/language_2/fixed_type_variable_test.dart b/tests/language_2/variable/fixed_type_variable_test.dart
similarity index 100%
rename from tests/language_2/fixed_type_variable_test.dart
rename to tests/language_2/variable/fixed_type_variable_test.dart
diff --git a/tests/language_2/illegal_initializer_runtime_test.dart b/tests/language_2/variable/illegal_initializer_runtime_test.dart
similarity index 100%
rename from tests/language_2/illegal_initializer_runtime_test.dart
rename to tests/language_2/variable/illegal_initializer_runtime_test.dart
diff --git a/tests/language_2/illegal_initializer_test.dart b/tests/language_2/variable/illegal_initializer_test.dart
similarity index 100%
rename from tests/language_2/illegal_initializer_test.dart
rename to tests/language_2/variable/illegal_initializer_test.dart
diff --git a/tests/language_2/inference_captured_variable2_test.dart b/tests/language_2/variable/inference_captured_variable2_test.dart
similarity index 100%
rename from tests/language_2/inference_captured_variable2_test.dart
rename to tests/language_2/variable/inference_captured_variable2_test.dart
diff --git a/tests/language_2/inference_captured_variable_test.dart b/tests/language_2/variable/inference_captured_variable_test.dart
similarity index 100%
rename from tests/language_2/inference_captured_variable_test.dart
rename to tests/language_2/variable/inference_captured_variable_test.dart
diff --git a/tests/language_2/initializer_super_last_runtime_test.dart b/tests/language_2/variable/initializer_super_last_runtime_test.dart
similarity index 100%
rename from tests/language_2/initializer_super_last_runtime_test.dart
rename to tests/language_2/variable/initializer_super_last_runtime_test.dart
diff --git a/tests/language_2/initializer_super_last_test.dart b/tests/language_2/variable/initializer_super_last_test.dart
similarity index 100%
rename from tests/language_2/initializer_super_last_test.dart
rename to tests/language_2/variable/initializer_super_last_test.dart
diff --git a/tests/language_2/inst_field_initializer1_test.dart b/tests/language_2/variable/inst_field_initializer1_test.dart
similarity index 100%
rename from tests/language_2/inst_field_initializer1_test.dart
rename to tests/language_2/variable/inst_field_initializer1_test.dart
diff --git a/tests/language_2/inst_field_initializer_test.dart b/tests/language_2/variable/inst_field_initializer_test.dart
similarity index 100%
rename from tests/language_2/inst_field_initializer_test.dart
rename to tests/language_2/variable/inst_field_initializer_test.dart
diff --git a/tests/language_2/labeled_variable_declaration_test.dart b/tests/language_2/variable/labeled_variable_declaration_test.dart
similarity index 100%
rename from tests/language_2/labeled_variable_declaration_test.dart
rename to tests/language_2/variable/labeled_variable_declaration_test.dart
diff --git a/tests/language_2/ref_before_declaration_runtime_test.dart b/tests/language_2/variable/ref_before_declaration_runtime_test.dart
similarity index 100%
rename from tests/language_2/ref_before_declaration_runtime_test.dart
rename to tests/language_2/variable/ref_before_declaration_runtime_test.dart
diff --git a/tests/language_2/ref_before_declaration_test.dart b/tests/language_2/variable/ref_before_declaration_test.dart
similarity index 100%
rename from tests/language_2/ref_before_declaration_test.dart
rename to tests/language_2/variable/ref_before_declaration_test.dart
diff --git a/tests/language_2/scope_variable_runtime_test.dart b/tests/language_2/variable/scope_variable_runtime_test.dart
similarity index 100%
rename from tests/language_2/scope_variable_runtime_test.dart
rename to tests/language_2/variable/scope_variable_runtime_test.dart
diff --git a/tests/language_2/scope_variable_test.dart b/tests/language_2/variable/scope_variable_test.dart
similarity index 100%
rename from tests/language_2/scope_variable_test.dart
rename to tests/language_2/variable/scope_variable_test.dart
diff --git a/tests/language_2/scoped_variables_try_catch_test.dart b/tests/language_2/variable/scoped_variables_try_catch_test.dart
similarity index 100%
rename from tests/language_2/scoped_variables_try_catch_test.dart
rename to tests/language_2/variable/scoped_variables_try_catch_test.dart
diff --git a/tests/language_2/variable_declaration_metadata_test.dart b/tests/language_2/variable/variable_declaration_metadata_test.dart
similarity index 100%
rename from tests/language_2/variable_declaration_metadata_test.dart
rename to tests/language_2/variable/variable_declaration_metadata_test.dart
diff --git a/tests/language_2/variable_named_dart_test.dart b/tests/language_2/variable/variable_named_dart_test.dart
similarity index 100%
rename from tests/language_2/variable_named_dart_test.dart
rename to tests/language_2/variable/variable_named_dart_test.dart