diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/pubspec.yaml b/LanguageFeatures/FinalizationRegistry/Finalizer/pubspec.yaml
deleted file mode 100644
index 9cac0bc..0000000
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/pubspec.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: co19_finalization_registry
-description: co19 tests for Dart Finalization Registry feature
-
-# This tests isn't intended for publishing on pub.dev.
-publish_to: none
-
-environment:
-  sdk: '>=2.12.0 <3.0.0'
-
-dependencies:
-  ffi: ^1.0.0
\ No newline at end of file
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t01.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t01.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t01.dart
index 9396afc..169e7e9 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t01.dart
@@ -13,8 +13,8 @@
 /// will not run if attached object is still accessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class A {}
 int called = 0;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t02.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t02.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t02.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t02.dart
index 6d6fdd9..05f6654 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t02.dart
@@ -13,8 +13,8 @@
 /// will run when attached object becomes inaccessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 int called = 0;
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t03.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t03.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t03.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t03.dart
index 6024dee..01ca35d 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t03.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t03.dart
@@ -13,8 +13,8 @@
 /// will run when attached object becomes inaccessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 int called = 0;
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t04.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t04.dart
similarity index 93%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t04.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t04.dart
index 577af5b..ad80fe6 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/Finalizer_A01_t04.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/Finalizer_A01_t04.dart
@@ -13,8 +13,8 @@
 /// will never run if attached object is accessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 int called = 0;
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t01.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t01.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t01.dart
index 87e6fc9..e994d67 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t01.dart
@@ -18,8 +18,8 @@
 /// inaccessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class A {}
 Object? returnedToken;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t02.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t02.dart
similarity index 93%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t02.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t02.dart
index aba01ba..1f13edb 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t02.dart
@@ -17,8 +17,8 @@
 /// detached from the object.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class A {}
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t03.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t03.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t03.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t03.dart
index ef45fc9..5f0f64f 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t03.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t03.dart
@@ -18,8 +18,8 @@
 /// becomes inaccessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class A {}
 Object? returnedToken;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t04.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t04.dart
similarity index 93%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t04.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t04.dart
index 1ed01de..cd6e162 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A01_t04.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A01_t04.dart
@@ -17,8 +17,8 @@
 /// be detached from the object.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class A {}
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A02_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A02_t01.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A02_t01.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A02_t01.dart
index 39a6b91..27d3c64 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A02_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A02_t01.dart
@@ -10,8 +10,8 @@
 /// finalization token is still accessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 bool called = false;
 final Finalizer finalizer = Finalizer((_) {
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A02_t02.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A02_t02.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A02_t02.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A02_t02.dart
index bcedc55..afe4bff 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A02_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A02_t02.dart
@@ -10,8 +10,8 @@
 /// given object is inaccessible.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 int called = 0;
 final Finalizer finalizer = Finalizer((_) {
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A03_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A03_t01.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A03_t01.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A03_t01.dart
index eb4f38f..1f10a54 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A03_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A03_t01.dart
@@ -9,8 +9,8 @@
 /// object can be detached from the finalizer using [detach].
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class A {}
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t05.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t05.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t05.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t05.dart
index 67ed48f..98936c2 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t05.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t05.dart
@@ -11,7 +11,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object detachToken = Object;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t06.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t06.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t06.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t06.dart
index aea50ac..ed9cb40 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t06.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t06.dart
@@ -11,7 +11,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t07.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t07.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t07.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t07.dart
index b991713..99e49fe 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t07.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t07.dart
@@ -11,7 +11,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import "../../../../Utils/expect.dart";
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t12.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t12.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t12.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t12.dart
index 44e2ed4..1f2f9ed 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t12.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t12.dart
@@ -11,7 +11,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object object = Object();
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t13.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t13.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t13.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t13.dart
index 7998097..ff67f69 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t13.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t13.dart
@@ -11,7 +11,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object object = Object();
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t14.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t14.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t14.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t14.dart
index 415124c..084ef92 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t14.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A04_t14.dart
@@ -11,7 +11,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object object = Object();
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A05_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A05_t01.dart
similarity index 90%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A05_t01.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A05_t01.dart
index 63612c0..c484b76 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A05_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A05_t01.dart
@@ -8,8 +8,8 @@
 /// object.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 int called = 0;
 final Finalizer finalizer = Finalizer((_) {
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A05_t02.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A05_t02.dart
similarity index 90%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A05_t02.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A05_t02.dart
index 27ccbb2..f42d405 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A05_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A05_t02.dart
@@ -8,8 +8,8 @@
 /// object.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 int called = 0;
 final Finalizer finalizer = Finalizer((_) {
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t01.dart
similarity index 93%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t01.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t01.dart
index 5f90882..9f11e22 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t01.dart
@@ -9,8 +9,8 @@
 /// the same finalization token several times.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class Nonce {
   final int value;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t02.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t02.dart
similarity index 93%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t02.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t02.dart
index 882c44c..6a35c34 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t02.dart
@@ -9,8 +9,8 @@
 /// the different finalization tokens.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class Nonce {
   final int value;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t03.dart b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t03.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t03.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t03.dart
index c785731..b7561b7 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A06_t03.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/Finalizer/attach_A06_t03.dart
@@ -9,8 +9,8 @@
 /// different, or the same, finalization tokens.
 /// @author iarkh@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import '../../gc_utils_lib.dart';
+import '../../../../Utils/expect.dart';
 
 class Nonce {
   final int value;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t01.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t01.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t01.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t01.dart
index 8cc70d8..2d1fcea 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t01.dart
@@ -14,8 +14,8 @@
 /// cleared
 /// @author sgrekhov@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t02.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t02.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t02.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t02.dart
index 0004d28..f762429 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t02.dart
@@ -14,8 +14,8 @@
 /// cleared
 /// @author sgrekhov@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t03.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t03.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t03.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t03.dart
index 68a2d78..353a1ba 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t03.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t03.dart
@@ -14,8 +14,8 @@
 /// cleared
 /// @author sgrekhov@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t04.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t04.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t04.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t04.dart
index f674d3b..62b4c9b 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t04.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t04.dart
@@ -14,8 +14,8 @@
 /// cleared
 /// @author sgrekhov@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t05.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t05.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t05.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t05.dart
index 96fab22..e48f355 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t05.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t05.dart
@@ -15,8 +15,8 @@
 /// @author sgrekhov@unipro.ru
 
 import "dart:async";
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t06.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t06.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t06.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t06.dart
index ae3d942..47d215d 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t06.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t06.dart
@@ -15,8 +15,8 @@
 /// @author sgrekhov@unipro.ru
 
 import "dart:async";
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t07.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t07.dart
similarity index 92%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t07.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t07.dart
index 8add804..4d8115d 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t07.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t07.dart
@@ -14,8 +14,8 @@
 /// cleared
 /// @author sgrekhov@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t08.dart b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t08.dart
similarity index 93%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t08.dart
rename to LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t08.dart
index bcb11f8..4b6216a 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/weak_reference_target_t08.dart
+++ b/LanguageFeatures/FinalizationRegistry/ffi/WeakReference/weak_reference_target_t08.dart
@@ -14,8 +14,8 @@
 /// cleared
 /// @author sgrekhov@unipro.ru
 
-import "../gc_utils_lib.dart";
-import "../../../Utils/expect.dart";
+import "../../gc_utils_lib.dart";
+import "../../../../Utils/expect.dart";
 
 class C {
   int id;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t01.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t01.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t01.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t01.dart
index 6b893c4..85d349f 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t01.dart
@@ -9,7 +9,7 @@
 /// Test String.
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object detachToken = Object;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t02.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t02.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t02.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t02.dart
index a381b51..a98c333 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t02.dart
@@ -9,7 +9,7 @@
 /// Test numbers.
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object detachToken = Object;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t03.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t03.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t03.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t03.dart
index 8f30a46..e7b45aa 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t03.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t03.dart
@@ -9,7 +9,7 @@
 /// Test booleans.
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object detachToken = Object;
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t04.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t04.dart
similarity index 93%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t04.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t04.dart
index ecffc3d..bbaccf4 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t04.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t04.dart
@@ -9,7 +9,7 @@
 /// Test [Null].
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t08.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t08.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t08.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t08.dart
index bb95413..64940f5 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t08.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t08.dart
@@ -9,7 +9,7 @@
 /// Test String.
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import "../../../../Utils/expect.dart";
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object object = Object();
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t09.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t09.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t09.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t09.dart
index 8868410..357e992 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t09.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t09.dart
@@ -9,7 +9,7 @@
 /// Test numbers.
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object object = Object();
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t10.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t10.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t10.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t10.dart
index cf7be63..863a5c7 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t10.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t10.dart
@@ -9,7 +9,7 @@
 /// Test booleans.
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object object = Object();
diff --git a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t11.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t11.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t11.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t11.dart
index da7010b..d971f52 100644
--- a/LanguageFeatures/FinalizationRegistry/Finalizer/attach_A04_t11.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/Finalizer/attach_A04_t11.dart
@@ -9,7 +9,7 @@
 /// Test [Null].
 /// @author iarkh@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 final Finalizer finalizer = Finalizer((_) { throw "Should not reach here"; });
 Object object = Object();
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t01.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t01.dart
similarity index 95%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t01.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t01.dart
index 49ff0ed..486598e 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t01.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t01.dart
@@ -11,7 +11,7 @@
 /// @author sgrekhov@unipro.ru
 /// @issue 48264
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 main() {
   Expect.throws(() {
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t02.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t02.dart
similarity index 96%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t02.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t02.dart
index 50c964f..732f55e 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t02.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t02.dart
@@ -11,7 +11,7 @@
 /// @author sgrekhov@unipro.ru
 /// @issue 48264
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 main() {
   Expect.throws(() {
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t04.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t04.dart
similarity index 96%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t04.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t04.dart
index a32c618..322e6ed 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t04.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t04.dart
@@ -13,7 +13,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 class S extends Struct {
   @Int32()
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t05.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t05.dart
similarity index 96%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t05.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t05.dart
index 7c05eef..177a497 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t05.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t05.dart
@@ -13,7 +13,7 @@
 
 import "dart:ffi";
 import "package:ffi/ffi.dart";
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 class U extends Union {
   @Int32()
diff --git a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t06.dart b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t06.dart
similarity index 94%
rename from LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t06.dart
rename to LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t06.dart
index f9c17ae..18edf7b 100644
--- a/LanguageFeatures/FinalizationRegistry/WeakReference/expando_key_t06.dart
+++ b/LanguageFeatures/FinalizationRegistry/no_ffi/WeakReference/expando_key_t06.dart
@@ -10,7 +10,7 @@
 /// not supported as an Expando key. Test null.
 /// @author sgrekhov@unipro.ru
 
-import "../../../Utils/expect.dart";
+import '../../../../Utils/expect.dart';
 
 main() {
   Expect.throws(() {