#1122. nonfunction-type-aliases tests moved out of type-aliases directory
diff --git a/LanguageFeatures/nnbd/type-aliases/assignability_A01_t01.dart b/LanguageFeatures/nnbd/assignability_A02_t01.dart
similarity index 95%
rename from LanguageFeatures/nnbd/type-aliases/assignability_A01_t01.dart
rename to LanguageFeatures/nnbd/assignability_A02_t01.dart
index 2c6ab73..3c18856 100644
--- a/LanguageFeatures/nnbd/type-aliases/assignability_A01_t01.dart
+++ b/LanguageFeatures/nnbd/assignability_A02_t01.dart
@@ -11,7 +11,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class A {}
class C extends A {}
diff --git a/LanguageFeatures/nnbd/type-aliases/assignability_A01_t02.dart b/LanguageFeatures/nnbd/assignability_A02_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/assignability_A01_t02.dart
rename to LanguageFeatures/nnbd/assignability_A02_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t05.dart b/LanguageFeatures/nnbd/extension_method_resolution_A01_t05.dart
similarity index 95%
rename from LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t05.dart
rename to LanguageFeatures/nnbd/extension_method_resolution_A01_t05.dart
index d07e345..63e6b5c 100644
--- a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t05.dart
+++ b/LanguageFeatures/nnbd/extension_method_resolution_A01_t05.dart
@@ -15,7 +15,7 @@
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
typedef IntAlias = int?;
diff --git a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t06.dart b/LanguageFeatures/nnbd/extension_method_resolution_A01_t06.dart
similarity index 95%
rename from LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t06.dart
rename to LanguageFeatures/nnbd/extension_method_resolution_A01_t06.dart
index 191e728..602fa92 100644
--- a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t06.dart
+++ b/LanguageFeatures/nnbd/extension_method_resolution_A01_t06.dart
@@ -14,7 +14,7 @@
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
typedef IntAlias = int;
IntAlias? i = 42;
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A01_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A01_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A01_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A01_t02.dart
index 684e9b8..4b03729 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A01_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A01_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
String test1 = "Lily was here";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A02_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A02_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A02_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A02_t02.dart
index 692839b..8b4ca0f 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A02_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A02_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
String test = "Lily was here";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A03_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A03_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A03_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A03_t02.dart
index 21ab34a..db3ca70 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A03_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A03_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
String test1() => "Lily was here";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A04_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A04_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A04_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A04_t02.dart
index 05a6c37..f803bff 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A04_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A04_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
String test1() => "Lily was here";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A06_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A06_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A06_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A06_t02.dart
index c19a6af..e0ed768 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A06_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A06_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
int operator[](int index) => index;
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A07_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A07_t02.dart
similarity index 95%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A07_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A07_t02.dart
index a0b48f2..2a46227 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A07_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A07_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
int operator[](int index) => index;
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A08_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A08_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A08_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A08_t02.dart
index b6e6648..b8a76fd 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A08_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A08_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
String test1 = "Lily was here";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A10_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A10_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A10_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A10_t02.dart
index 2632c4b..3afd002 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A10_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A10_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
String test1 = "Lily was here";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A12_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A12_t02.dart
similarity index 97%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A12_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A12_t02.dart
index ef2d07e..374aedb 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A12_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A12_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
List _list;
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A14_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A14_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A14_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A14_t02.dart
index b885e76..e433c89 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A14_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A14_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
List<int> _list = [3, 1, 4];
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A16_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A16_t02.dart
similarity index 98%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A16_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A16_t02.dart
index f3e57e9..fb164d3 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A16_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A16_t02.dart
@@ -21,7 +21,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
int c1 = 0, c2 = 0;
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t02.dart b/LanguageFeatures/nnbd/null_aware_operator_A17_t02.dart
similarity index 99%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t02.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A17_t02.dart
index b8b6ca1..2552ff0 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t02.dart
+++ b/LanguageFeatures/nnbd/null_aware_operator_A17_t02.dart
@@ -16,7 +16,7 @@
/// @issue 39141
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
int c1 = 0, c2 = 0;
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t05.dart b/LanguageFeatures/nnbd/null_aware_operator_A17_t05.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t05.dart
rename to LanguageFeatures/nnbd/null_aware_operator_A17_t05.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t03.dart b/LanguageFeatures/nnbd/null_promotion_A01_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t03.dart
rename to LanguageFeatures/nnbd/null_promotion_A01_t03.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t08.dart b/LanguageFeatures/nnbd/null_promotion_A01_t08.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t08.dart
rename to LanguageFeatures/nnbd/null_promotion_A01_t08.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t03.dart b/LanguageFeatures/nnbd/null_promotion_A02_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t03.dart
rename to LanguageFeatures/nnbd/null_promotion_A02_t03.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t04.dart b/LanguageFeatures/nnbd/null_promotion_A02_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t04.dart
rename to LanguageFeatures/nnbd/null_promotion_A02_t04.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t03.dart b/LanguageFeatures/nnbd/nullability_definitions_A01_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t03.dart
rename to LanguageFeatures/nnbd/nullability_definitions_A01_t03.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t07.dart b/LanguageFeatures/nnbd/nullability_definitions_A01_t07.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t07.dart
rename to LanguageFeatures/nnbd/nullability_definitions_A01_t07.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t04.dart b/LanguageFeatures/nnbd/nullability_definitions_A02_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t04.dart
rename to LanguageFeatures/nnbd/nullability_definitions_A02_t04.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t10.dart b/LanguageFeatures/nnbd/nullability_definitions_A02_t10.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t10.dart
rename to LanguageFeatures/nnbd/nullability_definitions_A02_t10.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t14.dart b/LanguageFeatures/nnbd/nullability_definitions_A02_t14.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t14.dart
rename to LanguageFeatures/nnbd/nullability_definitions_A02_t14.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t17.dart b/LanguageFeatures/nnbd/nullability_definitions_A02_t17.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t17.dart
rename to LanguageFeatures/nnbd/nullability_definitions_A02_t17.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/opted_in_aliases_lib.dart b/LanguageFeatures/nnbd/opted_in_aliases_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/opted_in_aliases_lib.dart
rename to LanguageFeatures/nnbd/opted_in_aliases_lib.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t04.dart b/LanguageFeatures/nnbd/static_errors_A01_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A01_t04.dart
rename to LanguageFeatures/nnbd/static_errors_A01_t04.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t05.dart b/LanguageFeatures/nnbd/static_errors_A01_t05.dart
similarity index 95%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A01_t05.dart
rename to LanguageFeatures/nnbd/static_errors_A01_t05.dart
index ddffecd..76dea96 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t05.dart
+++ b/LanguageFeatures/nnbd/static_errors_A01_t05.dart
@@ -13,7 +13,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class A {
}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t04.dart b/LanguageFeatures/nnbd/static_errors_A02_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A02_t04.dart
rename to LanguageFeatures/nnbd/static_errors_A02_t04.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t05.dart b/LanguageFeatures/nnbd/static_errors_A02_t05.dart
similarity index 94%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A02_t05.dart
rename to LanguageFeatures/nnbd/static_errors_A02_t05.dart
index fc027cf..402c2fd 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t05.dart
+++ b/LanguageFeatures/nnbd/static_errors_A02_t05.dart
@@ -12,7 +12,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class A {
}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A03_t03.dart b/LanguageFeatures/nnbd/static_errors_A03_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A03_t03.dart
rename to LanguageFeatures/nnbd/static_errors_A03_t03.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A14_t11.dart b/LanguageFeatures/nnbd/static_errors_A14_t11.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A14_t11.dart
rename to LanguageFeatures/nnbd/static_errors_A14_t11.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A15_t02.dart b/LanguageFeatures/nnbd/static_errors_A15_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A15_t02.dart
rename to LanguageFeatures/nnbd/static_errors_A15_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A16_t02.dart b/LanguageFeatures/nnbd/static_errors_A16_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A16_t02.dart
rename to LanguageFeatures/nnbd/static_errors_A16_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t02.dart b/LanguageFeatures/nnbd/static_errors_A17_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A17_t02.dart
rename to LanguageFeatures/nnbd/static_errors_A17_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart b/LanguageFeatures/nnbd/static_errors_A17_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart
rename to LanguageFeatures/nnbd/static_errors_A17_t04.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A18_t02.dart b/LanguageFeatures/nnbd/static_errors_A18_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A18_t02.dart
rename to LanguageFeatures/nnbd/static_errors_A18_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A19_t02.dart b/LanguageFeatures/nnbd/static_errors_A19_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A19_t02.dart
rename to LanguageFeatures/nnbd/static_errors_A19_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A32_t03.dart b/LanguageFeatures/nnbd/static_errors_A32_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/static_errors_A32_t03.dart
rename to LanguageFeatures/nnbd/static_errors_A32_t03.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A01_t04.dart b/LanguageFeatures/nnbd/syntax_A01_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/syntax_A01_t04.dart
rename to LanguageFeatures/nnbd/syntax_A01_t04.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A02_t02.dart b/LanguageFeatures/nnbd/syntax_A02_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/syntax_A02_t02.dart
rename to LanguageFeatures/nnbd/syntax_A02_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A02_t04.dart b/LanguageFeatures/nnbd/syntax_A02_t04.dart
similarity index 93%
rename from LanguageFeatures/nnbd/type-aliases/syntax_A02_t04.dart
rename to LanguageFeatures/nnbd/syntax_A02_t04.dart
index 8d72ba0..4d1df39 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A02_t04.dart
+++ b/LanguageFeatures/nnbd/syntax_A02_t04.dart
@@ -9,7 +9,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A03_t02.dart b/LanguageFeatures/nnbd/syntax_A03_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/syntax_A03_t02.dart
rename to LanguageFeatures/nnbd/syntax_A03_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A06_t02.dart b/LanguageFeatures/nnbd/syntax_A06_t02.dart
similarity index 95%
rename from LanguageFeatures/nnbd/type-aliases/syntax_A06_t02.dart
rename to LanguageFeatures/nnbd/syntax_A06_t02.dart
index b96bcfa..c68ace7 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A06_t02.dart
+++ b/LanguageFeatures/nnbd/syntax_A06_t02.dart
@@ -12,7 +12,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-strong
-import "../../../Utils/expect.dart";
+import '../../Utils/expect.dart';
class C {
int operator[](int index) => index * 2;
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A07_t02.dart b/LanguageFeatures/nnbd/syntax_A07_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/syntax_A07_t02.dart
rename to LanguageFeatures/nnbd/syntax_A07_t02.dart
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A07_t06.dart b/LanguageFeatures/nnbd/syntax_A07_t06.dart
similarity index 100%
rename from LanguageFeatures/nnbd/type-aliases/syntax_A07_t06.dart
rename to LanguageFeatures/nnbd/syntax_A07_t06.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/assignability_A01_t01.dart b/LanguageFeatures/nnbd/weak/assignability_A02_t01.dart
similarity index 94%
rename from LanguageFeatures/nnbd/weak/type-aliases/assignability_A01_t01.dart
rename to LanguageFeatures/nnbd/weak/assignability_A02_t01.dart
index 1186393..767b275 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/assignability_A01_t01.dart
+++ b/LanguageFeatures/nnbd/weak/assignability_A02_t01.dart
@@ -11,7 +11,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class A {}
class C extends A {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_opted_in_aliases_lib.dart b/LanguageFeatures/nnbd/weak/exports_A01_opted_in_aliases_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_opted_in_aliases_lib.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_opted_in_aliases_lib.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_opted_out_aliases_lib.dart b/LanguageFeatures/nnbd/weak/exports_A01_opted_out_aliases_lib.dart
similarity index 85%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_opted_out_aliases_lib.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_opted_out_aliases_lib.dart
index d64991e..0cfd29e 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_opted_out_aliases_lib.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_opted_out_aliases_lib.dart
@@ -7,6 +7,6 @@
// @dart=2.6
library export_opted_aliases_lib;
-export "exports_A01_opted_in_aliases_lib.dart";
+export '../exports_A01_opted_in_aliases_lib.dart';
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t01.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t01.dart
similarity index 94%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t01.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t01.dart
index 9ce27ff..bd937b1 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t01.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t01.dart
@@ -12,8 +12,8 @@
// Requirements=nnbd-weak
import "dart:async";
-import "../../../../Utils/expect.dart";
-import "exports_A01_opted_out_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
typedef exp_A = A? ;
typedef exp_Int = int? ;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t02.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t02.dart
similarity index 91%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t02.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t02.dart
index 6a3658b..c7422b1 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t02.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t02.dart
@@ -12,8 +12,8 @@
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
-import "exports_A01_opted_out_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
void testme() {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t03.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t03.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t03.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t04.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t04.dart
similarity index 92%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t04.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t04.dart
index a7c64c4..99449b0 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t04.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t04.dart
@@ -13,8 +13,8 @@
// Requirements=nnbd-weak
import "dart:async";
-import "../../../../Utils/expect.dart";
-import "exports_A01_opted_out_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
typedef exp_A = A ;
typedef exp_Int = int ;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t05.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t05.dart
similarity index 90%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t05.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t05.dart
index cdaa750..0c886cb 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t05.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t05.dart
@@ -12,8 +12,8 @@
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
-import "exports_A01_opted_out_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
void testme() {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t06.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t06.dart
similarity index 94%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t06.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t06.dart
index df38f57..bdca62c 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t06.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t06.dart
@@ -12,7 +12,7 @@
// Requirements=nnbd-weak
-import "exports_A01_opted_out_aliases_lib.dart";
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
main() {
AAlias a = null;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t07.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t07.dart
similarity index 87%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t07.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t07.dart
index 3ecce93..2d5b26d 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t07.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t07.dart
@@ -12,8 +12,8 @@
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
-import "exports_A01_opted_out_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
main() {
Expect.equals(Never, NeverAlias);
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t08.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t08.dart
similarity index 93%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t08.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t08.dart
index 5f54de7..ebde426 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t08.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t08.dart
@@ -12,7 +12,7 @@
// Requirements=nnbd-weak
-import "exports_A01_opted_out_aliases_lib.dart";
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
main() {
NeverAlias n1 = 1;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t09.dart b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t09.dart
similarity index 92%
rename from LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t09.dart
rename to LanguageFeatures/nnbd/weak/exports_A01_typedef2_t09.dart
index 4058c89..aa36da8 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t09.dart
+++ b/LanguageFeatures/nnbd/weak/exports_A01_typedef2_t09.dart
@@ -12,7 +12,7 @@
// Requirements=nnbd-weak
-import "exports_A01_opted_out_aliases_lib.dart";
+import 'type-aliases/exports_A01_opted_out_aliases_lib.dart';
main() {
NeverAlias n = null;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t05.dart b/LanguageFeatures/nnbd/weak/extension_method_resolution_A01_t05.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t05.dart
rename to LanguageFeatures/nnbd/weak/extension_method_resolution_A01_t05.dart
index be53026..f1b3f36 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t05.dart
+++ b/LanguageFeatures/nnbd/weak/extension_method_resolution_A01_t05.dart
@@ -15,7 +15,7 @@
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
typedef IntAlias = int?;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t06.dart b/LanguageFeatures/nnbd/weak/extension_method_resolution_A01_t06.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t06.dart
rename to LanguageFeatures/nnbd/weak/extension_method_resolution_A01_t06.dart
index 5b4880a..33eb800 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t06.dart
+++ b/LanguageFeatures/nnbd/weak/extension_method_resolution_A01_t06.dart
@@ -14,7 +14,7 @@
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t03.dart b/LanguageFeatures/nnbd/weak/generics_A01_t03.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t03.dart
rename to LanguageFeatures/nnbd/weak/generics_A01_t03.dart
index ce778c1..64e8ba5 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t03.dart
+++ b/LanguageFeatures/nnbd/weak/generics_A01_t03.dart
@@ -14,7 +14,7 @@
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class A<T> {}
typedef AAlias<T> = A<T>;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t04.dart b/LanguageFeatures/nnbd/weak/generics_A01_t04.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t04.dart
rename to LanguageFeatures/nnbd/weak/generics_A01_t04.dart
index 98447f4..7594e0d 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t04.dart
+++ b/LanguageFeatures/nnbd/weak/generics_A01_t04.dart
@@ -12,7 +12,7 @@
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class A<T> {}
typedef AAlias<T> = A<T>;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/legacy_libraries_A01_t03.dart b/LanguageFeatures/nnbd/weak/legacy_libraries_A01_t03.dart
similarity index 93%
rename from LanguageFeatures/nnbd/weak/type-aliases/legacy_libraries_A01_t03.dart
rename to LanguageFeatures/nnbd/weak/legacy_libraries_A01_t03.dart
index ea33a52..02b27a0 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/legacy_libraries_A01_t03.dart
+++ b/LanguageFeatures/nnbd/weak/legacy_libraries_A01_t03.dart
@@ -15,8 +15,8 @@
// @dart=2.6
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
-import "opted_in_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/opted_in_aliases_lib.dart';
main() {
AAliasNonNullable a1 = null;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/legacy_libraries_A03_t02.dart b/LanguageFeatures/nnbd/weak/legacy_libraries_A03_t02.dart
similarity index 90%
rename from LanguageFeatures/nnbd/weak/type-aliases/legacy_libraries_A03_t02.dart
rename to LanguageFeatures/nnbd/weak/legacy_libraries_A03_t02.dart
index b595657..fb14235 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/legacy_libraries_A03_t02.dart
+++ b/LanguageFeatures/nnbd/weak/legacy_libraries_A03_t02.dart
@@ -14,8 +14,8 @@
// @dart=2.6
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
-import "opted_in_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/opted_in_aliases_lib.dart';
main() {
NeverAlias n = null;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A01_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A01_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A01_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A01_t02.dart
index 49616af..9d3f752 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A01_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A01_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
String test1 = "Lily was here";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A02_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A02_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A02_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A02_t02.dart
index 4cd3e0e..3f1c7f5 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A02_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A02_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
String test = "Lily was here";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A03_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A03_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A03_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A03_t02.dart
index bc60ad8..75cd658 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A03_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A03_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
String test1() => "Lily was here";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A04_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A04_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A04_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A04_t02.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A06_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A06_t02.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A06_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A06_t02.dart
index 8de65b3..a33910e 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A06_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A06_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
int operator[](int index) => index;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A07_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A07_t02.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A07_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A07_t02.dart
index a8c4c24..cbaadf9 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A07_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A07_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
int operator[](int index) => index;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A08_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A08_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A08_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A08_t02.dart
index 2a5254b..435ad58 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A08_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A08_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
String test1 = "Lily was here";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A10_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A10_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A10_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A10_t02.dart
index 223e19a..0ee34f6 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A10_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A10_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
String test1 = "Lily was here";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A12_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A12_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A12_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A12_t02.dart
index 70920bb..dc43d52 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A12_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A12_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
List _list;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A14_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A14_t02.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A14_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A14_t02.dart
index 48423b4..9e57f99 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A14_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A14_t02.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
List<int> _list = [3, 1, 4];
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A16_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A16_t02.dart
similarity index 98%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A16_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A16_t02.dart
index 3ddd4dd..8320140 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A16_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A16_t02.dart
@@ -21,7 +21,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
int c1 = 0, c2 = 0;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A17_t02.dart b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t02.dart
similarity index 99%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A17_t02.dart
rename to LanguageFeatures/nnbd/weak/null_aware_operator_A17_t02.dart
index 56ba54a..d3c4e33 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A17_t02.dart
+++ b/LanguageFeatures/nnbd/weak/null_aware_operator_A17_t02.dart
@@ -16,7 +16,7 @@
/// @issue 39141
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
int c1 = 0, c2 = 0;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A01_t08.dart b/LanguageFeatures/nnbd/weak/null_promotion_A01_t08.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A01_t08.dart
rename to LanguageFeatures/nnbd/weak/null_promotion_A01_t08.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A02_t04.dart b/LanguageFeatures/nnbd/weak/null_promotion_A02_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A02_t04.dart
rename to LanguageFeatures/nnbd/weak/null_promotion_A02_t04.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t03.dart b/LanguageFeatures/nnbd/weak/nullability_definitions_A01_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t03.dart
rename to LanguageFeatures/nnbd/weak/nullability_definitions_A01_t03.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t07.dart b/LanguageFeatures/nnbd/weak/nullability_definitions_A01_t07.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t07.dart
rename to LanguageFeatures/nnbd/weak/nullability_definitions_A01_t07.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A02_t06.dart b/LanguageFeatures/nnbd/weak/nullability_definitions_A02_t06.dart
similarity index 96%
rename from LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A02_t06.dart
rename to LanguageFeatures/nnbd/weak/nullability_definitions_A02_t06.dart
index 7384e2b..dc3875d 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A02_t06.dart
+++ b/LanguageFeatures/nnbd/weak/nullability_definitions_A02_t06.dart
@@ -18,7 +18,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../legacy_lib.dart";
+import 'legacy_lib.dart';
typedef SAlias = S;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/opted_in_aliases_lib.dart b/LanguageFeatures/nnbd/weak/opted_in_aliases_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/opted_in_aliases_lib.dart
rename to LanguageFeatures/nnbd/weak/opted_in_aliases_lib.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A01_t05.dart b/LanguageFeatures/nnbd/weak/static_errors_A01_t05.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A01_t05.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A01_t05.dart
index c4e1899..2571bd1 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A01_t05.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A01_t05.dart
@@ -13,7 +13,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class A {
}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A02_t05.dart b/LanguageFeatures/nnbd/weak/static_errors_A02_t05.dart
similarity index 94%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A02_t05.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A02_t05.dart
index b01ce9b..a26d80f 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A02_t05.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A02_t05.dart
@@ -12,7 +12,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class A {
}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A14_t11.dart b/LanguageFeatures/nnbd/weak/static_errors_A14_t11.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A14_t11.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A14_t11.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A15_t04.dart b/LanguageFeatures/nnbd/weak/static_errors_A15_t04.dart
similarity index 97%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A15_t04.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A15_t04.dart
index 6036c69..b44ac86 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A15_t04.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A15_t04.dart
@@ -13,7 +13,7 @@
/// @issue 41501
// Requirements=nnbd-weak
-import "../legacy_lib.dart";
+import 'legacy_lib.dart';
typedef AAlias = A?;
typedef IAlias = I?;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t02.dart b/LanguageFeatures/nnbd/weak/static_errors_A17_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t02.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A17_t02.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart b/LanguageFeatures/nnbd/weak/static_errors_A17_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A17_t04.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A18_t02.dart b/LanguageFeatures/nnbd/weak/static_errors_A18_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A18_t02.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A18_t02.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A19_t03.dart b/LanguageFeatures/nnbd/weak/static_errors_A19_t03.dart
similarity index 97%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A19_t03.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A19_t03.dart
index 3a20c84..82182ac 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A19_t03.dart
+++ b/LanguageFeatures/nnbd/weak/static_errors_A19_t03.dart
@@ -10,7 +10,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../legacy_lib.dart";
+import 'legacy_lib.dart';
typedef AAlias = A?;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A32_t03.dart b/LanguageFeatures/nnbd/weak/static_errors_A32_t03.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/static_errors_A32_t03.dart
rename to LanguageFeatures/nnbd/weak/static_errors_A32_t03.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A01_t04.dart b/LanguageFeatures/nnbd/weak/syntax_A01_t04.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/syntax_A01_t04.dart
rename to LanguageFeatures/nnbd/weak/syntax_A01_t04.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t02.dart b/LanguageFeatures/nnbd/weak/syntax_A02_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t02.dart
rename to LanguageFeatures/nnbd/weak/syntax_A02_t02.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t04.dart b/LanguageFeatures/nnbd/weak/syntax_A02_t04.dart
similarity index 92%
rename from LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t04.dart
rename to LanguageFeatures/nnbd/weak/syntax_A02_t04.dart
index c10e7ad..e9c7c01 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t04.dart
+++ b/LanguageFeatures/nnbd/weak/syntax_A02_t04.dart
@@ -9,7 +9,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A03_t02.dart b/LanguageFeatures/nnbd/weak/syntax_A03_t02.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/syntax_A03_t02.dart
rename to LanguageFeatures/nnbd/weak/syntax_A03_t02.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A06_t02.dart b/LanguageFeatures/nnbd/weak/syntax_A06_t02.dart
similarity index 95%
rename from LanguageFeatures/nnbd/weak/type-aliases/syntax_A06_t02.dart
rename to LanguageFeatures/nnbd/weak/syntax_A06_t02.dart
index ef8eb4f..10daa34 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A06_t02.dart
+++ b/LanguageFeatures/nnbd/weak/syntax_A06_t02.dart
@@ -12,7 +12,7 @@
/// @author sgrekhov@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
+import '../../../Utils/expect.dart';
class C {
int operator[](int index) => index * 2;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A07_t06.dart b/LanguageFeatures/nnbd/weak/syntax_A07_t06.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/syntax_A07_t06.dart
rename to LanguageFeatures/nnbd/weak/syntax_A07_t06.dart
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t05.dart b/LanguageFeatures/nnbd/weak/type_reification_A01_t05.dart
similarity index 87%
rename from LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t05.dart
rename to LanguageFeatures/nnbd/weak/type_reification_A01_t05.dart
index 2410211..618b7c2 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t05.dart
+++ b/LanguageFeatures/nnbd/weak/type_reification_A01_t05.dart
@@ -8,8 +8,8 @@
/// @author iarkh@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
-import "type_reification_legacy_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/type_reification_legacy_aliases_lib.dart';
typedef AliasA = A;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t06.dart b/LanguageFeatures/nnbd/weak/type_reification_A01_t06.dart
similarity index 87%
rename from LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t06.dart
rename to LanguageFeatures/nnbd/weak/type_reification_A01_t06.dart
index 349e633..5335b36 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t06.dart
+++ b/LanguageFeatures/nnbd/weak/type_reification_A01_t06.dart
@@ -8,8 +8,8 @@
/// @author iarkh@unipro.ru
// Requirements=nnbd-weak
-import "../../../../Utils/expect.dart";
-import "type_reification_legacy_aliases_lib.dart";
+import '../../../Utils/expect.dart';
+import 'type-aliases/type_reification_legacy_aliases_lib.dart';
typedef AliasA = A;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_legacy_aliases_lib.dart b/LanguageFeatures/nnbd/weak/type_reification_legacy_aliases_lib.dart
similarity index 100%
rename from LanguageFeatures/nnbd/weak/type-aliases/type_reification_legacy_aliases_lib.dart
rename to LanguageFeatures/nnbd/weak/type_reification_legacy_aliases_lib.dart
