diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesFacadeForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesFacadeForLibraryTestGenerated.java
index 88666e2c0bf..6a0a5a33da4 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesFacadeForLibraryTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesFacadeForLibraryTestGenerated.java
@@ -16,95 +16,95 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/ultraLightFacades")
+@TestMetadata("compiler/testData/asJava/lightClasses/ultraLightFacades")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesFacadeForLibraryTestGenerated extends AbstractSymbolLightClassesFacadeForLibraryTest {
     @Test
     public void testAllFilesPresentInUltraLightFacades() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/ultraLightFacades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ultraLightFacades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
     }
 
     @Test
     @TestMetadata("coroutines.kt")
     public void testCoroutines() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/coroutines.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt");
     }
 
     @Test
     @TestMetadata("importAliases.kt")
     public void testImportAliases() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/importAliases.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt");
     }
 
     @Test
     @TestMetadata("inlineOnly.kt")
     public void testInlineOnly() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/inlineOnly.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt");
     }
 
     @Test
     @TestMetadata("jvmField.kt")
     public void testJvmField() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/jvmField.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt");
     }
 
     @Test
     @TestMetadata("jvmName.kt")
     public void testJvmName() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/jvmName.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt");
     }
 
     @Test
     @TestMetadata("jvmWildcardAnnotations.kt")
     public void testJvmWildcardAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt");
     }
 
     @Test
     @TestMetadata("lateinitProperty.kt")
     public void testLateinitProperty() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/lateinitProperty.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt");
     }
 
     @Test
     @TestMetadata("multifileFacade.kt")
     public void testMultifileFacade() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/multifileFacade.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt");
     }
 
     @Test
     @TestMetadata("multifileFacadeJvmName.kt")
     public void testMultifileFacadeJvmName() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt");
     }
 
     @Test
     @TestMetadata("properties.kt")
     public void testProperties() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/properties.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt");
     }
 
     @Test
     @TestMetadata("script.kts")
     public void testScript() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/script.kts");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts");
     }
 
     @Test
     @TestMetadata("simpleFunctions.kt")
     public void testSimpleFunctions() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/simpleFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt");
     }
 
     @Test
     @TestMetadata("throwsAnnotation.kt")
     public void testThrowsAnnotation() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt");
     }
 
     @Test
     @TestMetadata("wildcardOptimization.kt")
     public void testWildcardOptimization() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/wildcardOptimization.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt");
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java
index 20dac4962ce..7dcd47aa753 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java
@@ -16,513 +16,513 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/lightClasses")
+@TestMetadata("compiler/testData/asJava/lightClasses/lightClasses")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesForLibraryTestGenerated extends AbstractSymbolLightClassesForLibraryTest {
     @Test
     public void testAllFilesPresentInLightClasses() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "compilationErrors");
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "compilationErrors");
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInEnumConstructor.kt")
     public void testAnnotatedParameterInEnumConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInInnerClassConstructor.kt")
     public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedPropertyWithSites.kt")
     public void testAnnotatedPropertyWithSites() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt");
     }
 
     @Test
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJavaRepeatable.kt")
     public void testAnnotationJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJvmRepeatable.kt")
     public void testAnnotationJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJavaRepeatable.kt")
     public void testAnnotationKotlinAndJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJvmRepeatable.kt")
     public void testAnnotationKotlinAndJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationRepeatable.kt")
     public void testAnnotationRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt");
     }
 
     @Test
     @TestMetadata("Constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Constructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt");
     }
 
     @Test
     @TestMetadata("DataClassWithCustomImplementedMembers.kt")
     public void testDataClassWithCustomImplementedMembers() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt");
     }
 
     @Test
     @TestMetadata("DelegatedNested.kt")
     public void testDelegatedNested() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt");
     }
 
     @Test
     @TestMetadata("Delegation.kt")
     public void testDelegation() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedEnumEntry.kt")
     public void testDeprecatedEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedNotHiddenInClass.kt")
     public void testDeprecatedNotHiddenInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt");
     }
 
     @Test
     @TestMetadata("DollarsInName.kt")
     public void testDollarsInName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt");
     }
 
     @Test
     @TestMetadata("DollarsInNameNoPackage.kt")
     public void testDollarsInNameNoPackage() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt");
     }
 
     @Test
     @TestMetadata("EnumClass.kt")
     public void testEnumClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt");
     }
 
     @Test
     @TestMetadata("EnumClassWithEnumEntries.kt")
     public void testEnumClassWithEnumEntries() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt");
     }
 
     @Test
     @TestMetadata("EnumEntry.kt")
     public void testEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt");
     }
 
     @Test
     @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
     public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecated.kt")
     public void testHiddenDeprecated() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecatedInClass.kt")
     public void testHiddenDeprecatedInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt");
     }
 
     @Test
     @TestMetadata("InheritingInterfaceDefaultImpls.kt")
     public void testInheritingInterfaceDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("InlineReified.kt")
     public void testInlineReified() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InlineReified.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt");
     }
 
     @Test
     @TestMetadata("JavaBetween.kt")
     public void testJavaBetween() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JavaBetween.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt");
     }
 
     @Test
     @TestMetadata("JvmNameOnMember.kt")
     public void testJvmNameOnMember() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt");
     }
 
     @Test
     @TestMetadata("JvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt");
     }
 
     @Test
     @TestMetadata("LocalFunctions.kt")
     public void testLocalFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/LocalFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt");
     }
 
     @Test
     @TestMetadata("NestedObjects.kt")
     public void testNestedObjects() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt");
     }
 
     @Test
     @TestMetadata("NonDataClassWithComponentFunctions.kt")
     public void testNonDataClassWithComponentFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt");
     }
 
     @Test
     @TestMetadata("OnlySecondaryConstructors.kt")
     public void testOnlySecondaryConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt");
     }
 
     @Test
     @TestMetadata("PublishedApi.kt")
     public void testPublishedApi() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt");
     }
 
     @Test
     @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
     public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt");
     }
 
     @Test
     @TestMetadata("TypePararametersInClass.kt")
     public void testTypePararametersInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/TypePararametersInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt");
     }
 
     @Test
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt");
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/delegation")
     @TestDataPath("$PROJECT_ROOT")
     public class Delegation {
         @Test
         public void testAllFilesPresentInDelegation() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt");
         }
 
         @Test
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/facades")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/facades")
     @TestDataPath("$PROJECT_ROOT")
     public class Facades {
         @Test
         public void testAllFilesPresentInFacades() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllPrivate.kt")
         public void testAllPrivate() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt");
         }
 
         @Test
         @TestMetadata("MultiFile.kt")
         public void testMultiFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt");
         }
 
         @Test
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt");
         }
 
         @Test
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/ideRegression")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/ideRegression")
     @TestDataPath("$PROJECT_ROOT")
     public class IdeRegression {
         @Test
         public void testAllFilesPresentInIdeRegression() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllOpenAnnotatedClasses.kt")
         public void testAllOpenAnnotatedClasses() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
         }
 
         @Test
         @TestMetadata("ImplementingCharSequenceAndNumber.kt")
         public void testImplementingCharSequenceAndNumber() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMap.kt")
         public void testImplementingMap() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMutableSet.kt")
         public void testImplementingMutableSet() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt");
         }
 
         @Test
         @TestMetadata("InheritingInterfaceDefaultImpls.kt")
         public void testInheritingInterfaceDefaultImpls() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
         }
 
         @Test
         @TestMetadata("OverridingFinalInternal.kt")
         public void testOverridingFinalInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingInternal.kt")
         public void testOverridingInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingProtected.kt")
         public void testOverridingProtected() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations")
     @TestDataPath("$PROJECT_ROOT")
     public class NullabilityAnnotations {
         @Test
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt");
         }
 
         @Test
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
         }
 
         @Test
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt");
         }
 
         @Test
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt");
         }
 
         @Test
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
         }
 
         @Test
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
         }
 
         @Test
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
         }
 
         @Test
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
         }
 
         @Test
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
         }
 
         @Test
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt");
         }
 
         @Test
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
         }
 
         @Test
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt");
         }
 
         @Test
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt");
         }
 
         @Test
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
         }
 
         @Test
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt");
         }
 
         @Test
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/object")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/object")
     @TestDataPath("$PROJECT_ROOT")
     public class Object {
         @Test
         public void testAllFilesPresentInObject() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/publicField")
     @TestDataPath("$PROJECT_ROOT")
     public class PublicField {
         @Test
         public void testAllFilesPresentInPublicField() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt");
         }
 
         @Test
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/script")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/script")
     @TestDataPath("$PROJECT_ROOT")
     public class Script {
         @Test
         public void testAllFilesPresentInScript() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java
index 3e88a9d852d..6d7347d084f 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java
@@ -16,239 +16,239 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/ultraLightClasses")
+@TestMetadata("compiler/testData/asJava/lightClasses/ultraLightClasses")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesLoadingForLibraryTestGenerated extends AbstractSymbolLightClassesLoadingForLibraryTest {
     @Test
     public void testAllFilesPresentInUltraLightClasses() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/ultraLightClasses"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ultraLightClasses"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
     }
 
     @Test
     @TestMetadata("annotationWithSetParamPropertyModifier.kt")
     public void testAnnotationWithSetParamPropertyModifier() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.kt");
     }
 
     @Test
     @TestMetadata("annotations.kt")
     public void testAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/annotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.kt");
     }
 
     @Test
     @TestMetadata("classModifiers.kt")
     public void testClassModifiers() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/classModifiers.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.kt");
     }
 
     @Test
     @TestMetadata("constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/constructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.kt");
     }
 
     @Test
     @TestMetadata("coroutines.kt")
     public void testCoroutines() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/coroutines.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.kt");
     }
 
     @Test
     @TestMetadata("dataClasses.kt")
     public void testDataClasses() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/dataClasses.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.kt");
     }
 
     @Test
     @TestMetadata("defaultMethodInKotlinWithSettingAll.kt")
     public void testDefaultMethodInKotlinWithSettingAll() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt");
     }
 
     @Test
     @TestMetadata("defaultMethodInKotlinWithSettingAllCompatibility.kt")
     public void testDefaultMethodInKotlinWithSettingAllCompatibility() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt");
     }
 
     @Test
     @TestMetadata("delegatesWithAnnotations.kt")
     public void testDelegatesWithAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.kt");
     }
 
     @Test
     @TestMetadata("delegatingToInterfaces.kt")
     public void testDelegatingToInterfaces() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.kt");
     }
 
     @Test
     @TestMetadata("dollarsInNameLocal.kt")
     public void testDollarsInNameLocal() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.kt");
     }
 
     @Test
     @TestMetadata("enums.kt")
     public void testEnums() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/enums.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/enums.kt");
     }
 
     @Test
     @TestMetadata("generics.kt")
     public void testGenerics() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/generics.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/generics.kt");
     }
 
     @Test
     @TestMetadata("implementingKotlinCollections.kt")
     public void testImplementingKotlinCollections() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.kt");
     }
 
     @Test
     @TestMetadata("importAliases.kt")
     public void testImportAliases() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/importAliases.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.kt");
     }
 
     @Test
     @TestMetadata("inferringAnonymousObjectTypes.kt")
     public void testInferringAnonymousObjectTypes() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.kt");
     }
 
     @Test
     @TestMetadata("inheritance.kt")
     public void testInheritance() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inheritance.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.kt");
     }
 
     @Test
     @TestMetadata("inlineClasses.kt")
     public void testInlineClasses() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inlineClasses.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.kt");
     }
 
     @Test
     @TestMetadata("inlineOnly.kt")
     public void testInlineOnly() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inlineOnly.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.kt");
     }
 
     @Test
     @TestMetadata("inlineReified.kt")
     public void testInlineReified() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inlineReified.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.kt");
     }
 
     @Test
     @TestMetadata("jvmField.kt")
     public void testJvmField() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmField.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.kt");
     }
 
     @Test
     @TestMetadata("jvmName.kt")
     public void testJvmName() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmName.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.kt");
     }
 
     @Test
     @TestMetadata("jvmOverloads.kt")
     public void testJvmOverloads() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.kt");
     }
 
     @Test
     @TestMetadata("jvmRecord.kt")
     public void testJvmRecord() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmRecord.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.kt");
     }
 
     @Test
     @TestMetadata("jvmStaticOnPropertySetter.kt")
     public void testJvmStaticOnPropertySetter() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.kt");
     }
 
     @Test
     @TestMetadata("jvmSynthetic.kt")
     public void testJvmSynthetic() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.kt");
     }
 
     @Test
     @TestMetadata("jvmSyntheticForAccessors.kt")
     public void testJvmSyntheticForAccessors() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.kt");
     }
 
     @Test
     @TestMetadata("jvmWildcardAnnotations.kt")
     public void testJvmWildcardAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.kt");
     }
 
     @Test
     @TestMetadata("LateinitProperties.kt")
     public void testLateinitProperties() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/LateinitProperties.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.kt");
     }
 
     @Test
     @TestMetadata("lateinitProperty.kt")
     public void testLateinitProperty() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/lateinitProperty.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.kt");
     }
 
     @Test
     @TestMetadata("localClassDerived.kt")
     public void testLocalClassDerived() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/localClassDerived.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.kt");
     }
 
     @Test
     @TestMetadata("objects.kt")
     public void testObjects() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/objects.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/objects.kt");
     }
 
     @Test
     @TestMetadata("properties.kt")
     public void testProperties() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/properties.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/properties.kt");
     }
 
     @Test
     @TestMetadata("simpleFunctions.kt")
     public void testSimpleFunctions() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/simpleFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.kt");
     }
 
     @Test
     @TestMetadata("throwsAnnotation.kt")
     public void testThrowsAnnotation() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.kt");
     }
 
     @Test
     @TestMetadata("typeAliases.kt")
     public void testTypeAliases() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/typeAliases.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.kt");
     }
 
     @Test
     @TestMetadata("typeAnnotations.kt")
     public void testTypeAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.kt");
     }
 
     @Test
     @TestMetadata("wildcardOptimization.kt")
     public void testWildcardOptimization() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.kt");
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java
index c424ebed320..9c797a80fd8 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesParentingForLibraryTestGenerated.java
@@ -16,513 +16,513 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/lightClasses")
+@TestMetadata("compiler/testData/asJava/lightClasses/lightClasses")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesParentingForLibraryTestGenerated extends AbstractSymbolLightClassesParentingForLibraryTest {
     @Test
     public void testAllFilesPresentInLightClasses() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "compilationErrors");
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "compilationErrors");
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInEnumConstructor.kt")
     public void testAnnotatedParameterInEnumConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInInnerClassConstructor.kt")
     public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedPropertyWithSites.kt")
     public void testAnnotatedPropertyWithSites() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt");
     }
 
     @Test
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJavaRepeatable.kt")
     public void testAnnotationJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJvmRepeatable.kt")
     public void testAnnotationJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJavaRepeatable.kt")
     public void testAnnotationKotlinAndJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJvmRepeatable.kt")
     public void testAnnotationKotlinAndJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationRepeatable.kt")
     public void testAnnotationRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt");
     }
 
     @Test
     @TestMetadata("Constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Constructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt");
     }
 
     @Test
     @TestMetadata("DataClassWithCustomImplementedMembers.kt")
     public void testDataClassWithCustomImplementedMembers() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt");
     }
 
     @Test
     @TestMetadata("DelegatedNested.kt")
     public void testDelegatedNested() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt");
     }
 
     @Test
     @TestMetadata("Delegation.kt")
     public void testDelegation() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedEnumEntry.kt")
     public void testDeprecatedEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedNotHiddenInClass.kt")
     public void testDeprecatedNotHiddenInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt");
     }
 
     @Test
     @TestMetadata("DollarsInName.kt")
     public void testDollarsInName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt");
     }
 
     @Test
     @TestMetadata("DollarsInNameNoPackage.kt")
     public void testDollarsInNameNoPackage() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt");
     }
 
     @Test
     @TestMetadata("EnumClass.kt")
     public void testEnumClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt");
     }
 
     @Test
     @TestMetadata("EnumClassWithEnumEntries.kt")
     public void testEnumClassWithEnumEntries() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt");
     }
 
     @Test
     @TestMetadata("EnumEntry.kt")
     public void testEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt");
     }
 
     @Test
     @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
     public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecated.kt")
     public void testHiddenDeprecated() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecatedInClass.kt")
     public void testHiddenDeprecatedInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt");
     }
 
     @Test
     @TestMetadata("InheritingInterfaceDefaultImpls.kt")
     public void testInheritingInterfaceDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("InlineReified.kt")
     public void testInlineReified() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InlineReified.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt");
     }
 
     @Test
     @TestMetadata("JavaBetween.kt")
     public void testJavaBetween() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JavaBetween.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt");
     }
 
     @Test
     @TestMetadata("JvmNameOnMember.kt")
     public void testJvmNameOnMember() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt");
     }
 
     @Test
     @TestMetadata("JvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt");
     }
 
     @Test
     @TestMetadata("LocalFunctions.kt")
     public void testLocalFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/LocalFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt");
     }
 
     @Test
     @TestMetadata("NestedObjects.kt")
     public void testNestedObjects() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt");
     }
 
     @Test
     @TestMetadata("NonDataClassWithComponentFunctions.kt")
     public void testNonDataClassWithComponentFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt");
     }
 
     @Test
     @TestMetadata("OnlySecondaryConstructors.kt")
     public void testOnlySecondaryConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt");
     }
 
     @Test
     @TestMetadata("PublishedApi.kt")
     public void testPublishedApi() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt");
     }
 
     @Test
     @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
     public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt");
     }
 
     @Test
     @TestMetadata("TypePararametersInClass.kt")
     public void testTypePararametersInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/TypePararametersInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt");
     }
 
     @Test
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt");
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/delegation")
     @TestDataPath("$PROJECT_ROOT")
     public class Delegation {
         @Test
         public void testAllFilesPresentInDelegation() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt");
         }
 
         @Test
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/facades")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/facades")
     @TestDataPath("$PROJECT_ROOT")
     public class Facades {
         @Test
         public void testAllFilesPresentInFacades() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllPrivate.kt")
         public void testAllPrivate() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt");
         }
 
         @Test
         @TestMetadata("MultiFile.kt")
         public void testMultiFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt");
         }
 
         @Test
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt");
         }
 
         @Test
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/ideRegression")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/ideRegression")
     @TestDataPath("$PROJECT_ROOT")
     public class IdeRegression {
         @Test
         public void testAllFilesPresentInIdeRegression() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllOpenAnnotatedClasses.kt")
         public void testAllOpenAnnotatedClasses() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
         }
 
         @Test
         @TestMetadata("ImplementingCharSequenceAndNumber.kt")
         public void testImplementingCharSequenceAndNumber() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMap.kt")
         public void testImplementingMap() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMutableSet.kt")
         public void testImplementingMutableSet() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt");
         }
 
         @Test
         @TestMetadata("InheritingInterfaceDefaultImpls.kt")
         public void testInheritingInterfaceDefaultImpls() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
         }
 
         @Test
         @TestMetadata("OverridingFinalInternal.kt")
         public void testOverridingFinalInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingInternal.kt")
         public void testOverridingInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingProtected.kt")
         public void testOverridingProtected() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations")
     @TestDataPath("$PROJECT_ROOT")
     public class NullabilityAnnotations {
         @Test
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt");
         }
 
         @Test
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
         }
 
         @Test
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt");
         }
 
         @Test
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt");
         }
 
         @Test
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
         }
 
         @Test
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
         }
 
         @Test
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
         }
 
         @Test
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
         }
 
         @Test
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
         }
 
         @Test
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt");
         }
 
         @Test
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
         }
 
         @Test
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt");
         }
 
         @Test
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt");
         }
 
         @Test
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
         }
 
         @Test
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt");
         }
 
         @Test
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/object")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/object")
     @TestDataPath("$PROJECT_ROOT")
     public class Object {
         @Test
         public void testAllFilesPresentInObject() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/publicField")
     @TestDataPath("$PROJECT_ROOT")
     public class PublicField {
         @Test
         public void testAllFilesPresentInPublicField() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt");
         }
 
         @Test
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/script")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/script")
     @TestDataPath("$PROJECT_ROOT")
     public class Script {
         @Test
         public void testAllFilesPresentInScript() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesFacadeForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesFacadeForSourceTestGenerated.java
index 5936c7dfc0f..68f4f40769e 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesFacadeForSourceTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesFacadeForSourceTestGenerated.java
@@ -16,95 +16,95 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/ultraLightFacades")
+@TestMetadata("compiler/testData/asJava/lightClasses/ultraLightFacades")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesFacadeForSourceTestGenerated extends AbstractSymbolLightClassesFacadeForSourceTest {
     @Test
     public void testAllFilesPresentInUltraLightFacades() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/ultraLightFacades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ultraLightFacades"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
     }
 
     @Test
     @TestMetadata("coroutines.kt")
     public void testCoroutines() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/coroutines.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt");
     }
 
     @Test
     @TestMetadata("importAliases.kt")
     public void testImportAliases() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/importAliases.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt");
     }
 
     @Test
     @TestMetadata("inlineOnly.kt")
     public void testInlineOnly() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/inlineOnly.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt");
     }
 
     @Test
     @TestMetadata("jvmField.kt")
     public void testJvmField() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/jvmField.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt");
     }
 
     @Test
     @TestMetadata("jvmName.kt")
     public void testJvmName() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/jvmName.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt");
     }
 
     @Test
     @TestMetadata("jvmWildcardAnnotations.kt")
     public void testJvmWildcardAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt");
     }
 
     @Test
     @TestMetadata("lateinitProperty.kt")
     public void testLateinitProperty() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/lateinitProperty.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt");
     }
 
     @Test
     @TestMetadata("multifileFacade.kt")
     public void testMultifileFacade() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/multifileFacade.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt");
     }
 
     @Test
     @TestMetadata("multifileFacadeJvmName.kt")
     public void testMultifileFacadeJvmName() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt");
     }
 
     @Test
     @TestMetadata("properties.kt")
     public void testProperties() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/properties.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt");
     }
 
     @Test
     @TestMetadata("script.kts")
     public void testScript() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/script.kts");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts");
     }
 
     @Test
     @TestMetadata("simpleFunctions.kt")
     public void testSimpleFunctions() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/simpleFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt");
     }
 
     @Test
     @TestMetadata("throwsAnnotation.kt")
     public void testThrowsAnnotation() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt");
     }
 
     @Test
     @TestMetadata("wildcardOptimization.kt")
     public void testWildcardOptimization() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightFacades/wildcardOptimization.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt");
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java
index 04d8deb5a96..855b13b8502 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java
@@ -16,649 +16,649 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/lightClasses")
+@TestMetadata("compiler/testData/asJava/lightClasses/lightClasses")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesForSourceTestGenerated extends AbstractSymbolLightClassesForSourceTest {
     @Test
     public void testAllFilesPresentInLightClasses() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInEnumConstructor.kt")
     public void testAnnotatedParameterInEnumConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInInnerClassConstructor.kt")
     public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedPropertyWithSites.kt")
     public void testAnnotatedPropertyWithSites() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt");
     }
 
     @Test
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJavaRepeatable.kt")
     public void testAnnotationJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJvmRepeatable.kt")
     public void testAnnotationJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJavaRepeatable.kt")
     public void testAnnotationKotlinAndJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJvmRepeatable.kt")
     public void testAnnotationKotlinAndJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationRepeatable.kt")
     public void testAnnotationRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt");
     }
 
     @Test
     @TestMetadata("Constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Constructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt");
     }
 
     @Test
     @TestMetadata("DataClassWithCustomImplementedMembers.kt")
     public void testDataClassWithCustomImplementedMembers() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt");
     }
 
     @Test
     @TestMetadata("DelegatedNested.kt")
     public void testDelegatedNested() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt");
     }
 
     @Test
     @TestMetadata("Delegation.kt")
     public void testDelegation() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedEnumEntry.kt")
     public void testDeprecatedEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedNotHiddenInClass.kt")
     public void testDeprecatedNotHiddenInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt");
     }
 
     @Test
     @TestMetadata("DollarsInName.kt")
     public void testDollarsInName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt");
     }
 
     @Test
     @TestMetadata("DollarsInNameNoPackage.kt")
     public void testDollarsInNameNoPackage() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt");
     }
 
     @Test
     @TestMetadata("EnumClass.kt")
     public void testEnumClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt");
     }
 
     @Test
     @TestMetadata("EnumClassWithEnumEntries.kt")
     public void testEnumClassWithEnumEntries() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt");
     }
 
     @Test
     @TestMetadata("EnumEntry.kt")
     public void testEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt");
     }
 
     @Test
     @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
     public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecated.kt")
     public void testHiddenDeprecated() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecatedInClass.kt")
     public void testHiddenDeprecatedInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt");
     }
 
     @Test
     @TestMetadata("InheritingInterfaceDefaultImpls.kt")
     public void testInheritingInterfaceDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("InlineReified.kt")
     public void testInlineReified() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InlineReified.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt");
     }
 
     @Test
     @TestMetadata("JavaBetween.kt")
     public void testJavaBetween() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JavaBetween.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt");
     }
 
     @Test
     @TestMetadata("JvmNameOnMember.kt")
     public void testJvmNameOnMember() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt");
     }
 
     @Test
     @TestMetadata("JvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt");
     }
 
     @Test
     @TestMetadata("LocalFunctions.kt")
     public void testLocalFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/LocalFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt");
     }
 
     @Test
     @TestMetadata("NestedObjects.kt")
     public void testNestedObjects() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt");
     }
 
     @Test
     @TestMetadata("NonDataClassWithComponentFunctions.kt")
     public void testNonDataClassWithComponentFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt");
     }
 
     @Test
     @TestMetadata("OnlySecondaryConstructors.kt")
     public void testOnlySecondaryConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt");
     }
 
     @Test
     @TestMetadata("PublishedApi.kt")
     public void testPublishedApi() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt");
     }
 
     @Test
     @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
     public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt");
     }
 
     @Test
     @TestMetadata("TypePararametersInClass.kt")
     public void testTypePararametersInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/TypePararametersInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt");
     }
 
     @Test
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt");
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/compilationErrors")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors")
     @TestDataPath("$PROJECT_ROOT")
     public class CompilationErrors {
         @Test
         @TestMetadata("ActualClass.kt")
         public void testActualClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.kt");
         }
 
         @Test
         @TestMetadata("ActualTypeAlias.kt")
         public void testActualTypeAlias() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.kt");
         }
 
         @Test
         @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt")
         public void testActualTypeAliasCustomJvmPackageName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
         }
 
         @Test
         public void testAllFilesPresentInCompilationErrors() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllInlineOnly.kt")
         public void testAllInlineOnly() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.kt");
         }
 
         @Test
         @TestMetadata("AnnotationModifiers.kt")
         public void testAnnotationModifiers() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.kt");
         }
 
         @Test
         @TestMetadata("EnumNameOverride.kt")
         public void testEnumNameOverride() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.kt");
         }
 
         @Test
         @TestMetadata("ExpectClass.kt")
         public void testExpectClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.kt");
         }
 
         @Test
         @TestMetadata("ExpectObject.kt")
         public void testExpectObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.kt");
         }
 
         @Test
         @TestMetadata("ExpectedNestedClass.kt")
         public void testExpectedNestedClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.kt");
         }
 
         @Test
         @TestMetadata("ExpectedNestedClassInObject.kt")
         public void testExpectedNestedClassInObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
         }
 
         @Test
         @TestMetadata("FunctionWithoutName.kt")
         public void testFunctionWithoutName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.kt");
         }
 
         @Test
         @TestMetadata("JvmPackageName.kt")
         public void testJvmPackageName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.kt");
         }
 
         @Test
         @TestMetadata("LocalInAnnotation.kt")
         public void testLocalInAnnotation() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.kt");
         }
 
         @Test
         @TestMetadata("PrivateInTrait.kt")
         public void testPrivateInTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.kt");
         }
 
         @Test
         @TestMetadata("PropertyWithoutName.kt")
         public void testPropertyWithoutName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PropertyWithoutName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.kt");
         }
 
         @Test
         @TestMetadata("RepetableAnnotations.kt")
         public void testRepetableAnnotations() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.kt");
         }
 
         @Test
         @TestMetadata("SameName.kt")
         public void testSameName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.kt");
         }
 
         @Test
         @TestMetadata("TopLevelDestructuring.kt")
         public void testTopLevelDestructuring() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.kt");
         }
 
         @Test
         @TestMetadata("TraitClassObjectField.kt")
         public void testTraitClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.kt");
         }
 
         @Test
         @TestMetadata("TwoOverrides.kt")
         public void testTwoOverrides() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.kt");
         }
 
         @Test
         @TestMetadata("WrongAnnotations.kt")
         public void testWrongAnnotations() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/delegation")
     @TestDataPath("$PROJECT_ROOT")
     public class Delegation {
         @Test
         public void testAllFilesPresentInDelegation() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt");
         }
 
         @Test
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/facades")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/facades")
     @TestDataPath("$PROJECT_ROOT")
     public class Facades {
         @Test
         public void testAllFilesPresentInFacades() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllPrivate.kt")
         public void testAllPrivate() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt");
         }
 
         @Test
         @TestMetadata("MultiFile.kt")
         public void testMultiFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt");
         }
 
         @Test
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt");
         }
 
         @Test
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/ideRegression")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/ideRegression")
     @TestDataPath("$PROJECT_ROOT")
     public class IdeRegression {
         @Test
         public void testAllFilesPresentInIdeRegression() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllOpenAnnotatedClasses.kt")
         public void testAllOpenAnnotatedClasses() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
         }
 
         @Test
         @TestMetadata("ImplementingCharSequenceAndNumber.kt")
         public void testImplementingCharSequenceAndNumber() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMap.kt")
         public void testImplementingMap() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMutableSet.kt")
         public void testImplementingMutableSet() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt");
         }
 
         @Test
         @TestMetadata("InheritingInterfaceDefaultImpls.kt")
         public void testInheritingInterfaceDefaultImpls() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
         }
 
         @Test
         @TestMetadata("OverridingFinalInternal.kt")
         public void testOverridingFinalInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingInternal.kt")
         public void testOverridingInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingProtected.kt")
         public void testOverridingProtected() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations")
     @TestDataPath("$PROJECT_ROOT")
     public class NullabilityAnnotations {
         @Test
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt");
         }
 
         @Test
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
         }
 
         @Test
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt");
         }
 
         @Test
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt");
         }
 
         @Test
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
         }
 
         @Test
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
         }
 
         @Test
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
         }
 
         @Test
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
         }
 
         @Test
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
         }
 
         @Test
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt");
         }
 
         @Test
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
         }
 
         @Test
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt");
         }
 
         @Test
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt");
         }
 
         @Test
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
         }
 
         @Test
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt");
         }
 
         @Test
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/object")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/object")
     @TestDataPath("$PROJECT_ROOT")
     public class Object {
         @Test
         public void testAllFilesPresentInObject() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/publicField")
     @TestDataPath("$PROJECT_ROOT")
     public class PublicField {
         @Test
         public void testAllFilesPresentInPublicField() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt");
         }
 
         @Test
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/script")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/script")
     @TestDataPath("$PROJECT_ROOT")
     public class Script {
         @Test
         public void testAllFilesPresentInScript() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java
index 245c8bce066..250e1182469 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java
@@ -16,239 +16,239 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/ultraLightClasses")
+@TestMetadata("compiler/testData/asJava/lightClasses/ultraLightClasses")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesLoadingForSourceTestGenerated extends AbstractSymbolLightClassesLoadingForSourceTest {
     @Test
     public void testAllFilesPresentInUltraLightClasses() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/ultraLightClasses"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ultraLightClasses"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
     }
 
     @Test
     @TestMetadata("annotationWithSetParamPropertyModifier.kt")
     public void testAnnotationWithSetParamPropertyModifier() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.kt");
     }
 
     @Test
     @TestMetadata("annotations.kt")
     public void testAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/annotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.kt");
     }
 
     @Test
     @TestMetadata("classModifiers.kt")
     public void testClassModifiers() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/classModifiers.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.kt");
     }
 
     @Test
     @TestMetadata("constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/constructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.kt");
     }
 
     @Test
     @TestMetadata("coroutines.kt")
     public void testCoroutines() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/coroutines.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.kt");
     }
 
     @Test
     @TestMetadata("dataClasses.kt")
     public void testDataClasses() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/dataClasses.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.kt");
     }
 
     @Test
     @TestMetadata("defaultMethodInKotlinWithSettingAll.kt")
     public void testDefaultMethodInKotlinWithSettingAll() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt");
     }
 
     @Test
     @TestMetadata("defaultMethodInKotlinWithSettingAllCompatibility.kt")
     public void testDefaultMethodInKotlinWithSettingAllCompatibility() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt");
     }
 
     @Test
     @TestMetadata("delegatesWithAnnotations.kt")
     public void testDelegatesWithAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.kt");
     }
 
     @Test
     @TestMetadata("delegatingToInterfaces.kt")
     public void testDelegatingToInterfaces() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.kt");
     }
 
     @Test
     @TestMetadata("dollarsInNameLocal.kt")
     public void testDollarsInNameLocal() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.kt");
     }
 
     @Test
     @TestMetadata("enums.kt")
     public void testEnums() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/enums.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/enums.kt");
     }
 
     @Test
     @TestMetadata("generics.kt")
     public void testGenerics() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/generics.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/generics.kt");
     }
 
     @Test
     @TestMetadata("implementingKotlinCollections.kt")
     public void testImplementingKotlinCollections() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.kt");
     }
 
     @Test
     @TestMetadata("importAliases.kt")
     public void testImportAliases() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/importAliases.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.kt");
     }
 
     @Test
     @TestMetadata("inferringAnonymousObjectTypes.kt")
     public void testInferringAnonymousObjectTypes() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.kt");
     }
 
     @Test
     @TestMetadata("inheritance.kt")
     public void testInheritance() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inheritance.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.kt");
     }
 
     @Test
     @TestMetadata("inlineClasses.kt")
     public void testInlineClasses() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inlineClasses.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.kt");
     }
 
     @Test
     @TestMetadata("inlineOnly.kt")
     public void testInlineOnly() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inlineOnly.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.kt");
     }
 
     @Test
     @TestMetadata("inlineReified.kt")
     public void testInlineReified() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/inlineReified.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.kt");
     }
 
     @Test
     @TestMetadata("jvmField.kt")
     public void testJvmField() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmField.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.kt");
     }
 
     @Test
     @TestMetadata("jvmName.kt")
     public void testJvmName() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmName.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.kt");
     }
 
     @Test
     @TestMetadata("jvmOverloads.kt")
     public void testJvmOverloads() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.kt");
     }
 
     @Test
     @TestMetadata("jvmRecord.kt")
     public void testJvmRecord() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmRecord.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.kt");
     }
 
     @Test
     @TestMetadata("jvmStaticOnPropertySetter.kt")
     public void testJvmStaticOnPropertySetter() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.kt");
     }
 
     @Test
     @TestMetadata("jvmSynthetic.kt")
     public void testJvmSynthetic() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.kt");
     }
 
     @Test
     @TestMetadata("jvmSyntheticForAccessors.kt")
     public void testJvmSyntheticForAccessors() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.kt");
     }
 
     @Test
     @TestMetadata("jvmWildcardAnnotations.kt")
     public void testJvmWildcardAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.kt");
     }
 
     @Test
     @TestMetadata("LateinitProperties.kt")
     public void testLateinitProperties() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/LateinitProperties.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.kt");
     }
 
     @Test
     @TestMetadata("lateinitProperty.kt")
     public void testLateinitProperty() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/lateinitProperty.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.kt");
     }
 
     @Test
     @TestMetadata("localClassDerived.kt")
     public void testLocalClassDerived() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/localClassDerived.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.kt");
     }
 
     @Test
     @TestMetadata("objects.kt")
     public void testObjects() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/objects.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/objects.kt");
     }
 
     @Test
     @TestMetadata("properties.kt")
     public void testProperties() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/properties.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/properties.kt");
     }
 
     @Test
     @TestMetadata("simpleFunctions.kt")
     public void testSimpleFunctions() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/simpleFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.kt");
     }
 
     @Test
     @TestMetadata("throwsAnnotation.kt")
     public void testThrowsAnnotation() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.kt");
     }
 
     @Test
     @TestMetadata("typeAliases.kt")
     public void testTypeAliases() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/typeAliases.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.kt");
     }
 
     @Test
     @TestMetadata("typeAnnotations.kt")
     public void testTypeAnnotations() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.kt");
     }
 
     @Test
     @TestMetadata("wildcardOptimization.kt")
     public void testWildcardOptimization() throws Exception {
-        runTest("compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt");
+        runTest("compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.kt");
     }
 }
diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java
index 1b53f1d26b7..e835321d81b 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingForSourceTestGenerated.java
@@ -16,649 +16,649 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/lightClasses")
+@TestMetadata("compiler/testData/asJava/lightClasses/lightClasses")
 @TestDataPath("$PROJECT_ROOT")
 public class SymbolLightClassesParentingForSourceTestGenerated extends AbstractSymbolLightClassesParentingForSourceTest {
     @Test
     public void testAllFilesPresentInLightClasses() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInEnumConstructor.kt")
     public void testAnnotatedParameterInEnumConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedParameterInInnerClassConstructor.kt")
     public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
     }
 
     @Test
     @TestMetadata("AnnotatedPropertyWithSites.kt")
     public void testAnnotatedPropertyWithSites() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt");
     }
 
     @Test
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJavaRepeatable.kt")
     public void testAnnotationJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationJvmRepeatable.kt")
     public void testAnnotationJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJavaRepeatable.kt")
     public void testAnnotationKotlinAndJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationKotlinAndJvmRepeatable.kt")
     public void testAnnotationKotlinAndJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
     }
 
     @Test
     @TestMetadata("AnnotationRepeatable.kt")
     public void testAnnotationRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt");
     }
 
     @Test
     @TestMetadata("Constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Constructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt");
     }
 
     @Test
     @TestMetadata("DataClassWithCustomImplementedMembers.kt")
     public void testDataClassWithCustomImplementedMembers() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt");
     }
 
     @Test
     @TestMetadata("DelegatedNested.kt")
     public void testDelegatedNested() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt");
     }
 
     @Test
     @TestMetadata("Delegation.kt")
     public void testDelegation() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedEnumEntry.kt")
     public void testDeprecatedEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt");
     }
 
     @Test
     @TestMetadata("DeprecatedNotHiddenInClass.kt")
     public void testDeprecatedNotHiddenInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt");
     }
 
     @Test
     @TestMetadata("DollarsInName.kt")
     public void testDollarsInName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt");
     }
 
     @Test
     @TestMetadata("DollarsInNameNoPackage.kt")
     public void testDollarsInNameNoPackage() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt");
     }
 
     @Test
     @TestMetadata("EnumClass.kt")
     public void testEnumClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt");
     }
 
     @Test
     @TestMetadata("EnumClassWithEnumEntries.kt")
     public void testEnumClassWithEnumEntries() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt");
     }
 
     @Test
     @TestMetadata("EnumEntry.kt")
     public void testEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt");
     }
 
     @Test
     @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
     public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecated.kt")
     public void testHiddenDeprecated() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt");
     }
 
     @Test
     @TestMetadata("HiddenDeprecatedInClass.kt")
     public void testHiddenDeprecatedInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt");
     }
 
     @Test
     @TestMetadata("InheritingInterfaceDefaultImpls.kt")
     public void testInheritingInterfaceDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt");
     }
 
     @Test
     @TestMetadata("InlineReified.kt")
     public void testInlineReified() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InlineReified.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt");
     }
 
     @Test
     @TestMetadata("JavaBetween.kt")
     public void testJavaBetween() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JavaBetween.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt");
     }
 
     @Test
     @TestMetadata("JvmNameOnMember.kt")
     public void testJvmNameOnMember() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt");
     }
 
     @Test
     @TestMetadata("JvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt");
     }
 
     @Test
     @TestMetadata("LocalFunctions.kt")
     public void testLocalFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/LocalFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt");
     }
 
     @Test
     @TestMetadata("NestedObjects.kt")
     public void testNestedObjects() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt");
     }
 
     @Test
     @TestMetadata("NonDataClassWithComponentFunctions.kt")
     public void testNonDataClassWithComponentFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt");
     }
 
     @Test
     @TestMetadata("OnlySecondaryConstructors.kt")
     public void testOnlySecondaryConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt");
     }
 
     @Test
     @TestMetadata("PublishedApi.kt")
     public void testPublishedApi() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt");
     }
 
     @Test
     @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
     public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
     }
 
     @Test
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt");
     }
 
     @Test
     @TestMetadata("TypePararametersInClass.kt")
     public void testTypePararametersInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/TypePararametersInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt");
     }
 
     @Test
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt");
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/compilationErrors")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors")
     @TestDataPath("$PROJECT_ROOT")
     public class CompilationErrors {
         @Test
         @TestMetadata("ActualClass.kt")
         public void testActualClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.kt");
         }
 
         @Test
         @TestMetadata("ActualTypeAlias.kt")
         public void testActualTypeAlias() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.kt");
         }
 
         @Test
         @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt")
         public void testActualTypeAliasCustomJvmPackageName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
         }
 
         @Test
         public void testAllFilesPresentInCompilationErrors() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllInlineOnly.kt")
         public void testAllInlineOnly() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.kt");
         }
 
         @Test
         @TestMetadata("AnnotationModifiers.kt")
         public void testAnnotationModifiers() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.kt");
         }
 
         @Test
         @TestMetadata("EnumNameOverride.kt")
         public void testEnumNameOverride() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.kt");
         }
 
         @Test
         @TestMetadata("ExpectClass.kt")
         public void testExpectClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.kt");
         }
 
         @Test
         @TestMetadata("ExpectObject.kt")
         public void testExpectObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.kt");
         }
 
         @Test
         @TestMetadata("ExpectedNestedClass.kt")
         public void testExpectedNestedClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.kt");
         }
 
         @Test
         @TestMetadata("ExpectedNestedClassInObject.kt")
         public void testExpectedNestedClassInObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
         }
 
         @Test
         @TestMetadata("FunctionWithoutName.kt")
         public void testFunctionWithoutName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.kt");
         }
 
         @Test
         @TestMetadata("JvmPackageName.kt")
         public void testJvmPackageName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.kt");
         }
 
         @Test
         @TestMetadata("LocalInAnnotation.kt")
         public void testLocalInAnnotation() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.kt");
         }
 
         @Test
         @TestMetadata("PrivateInTrait.kt")
         public void testPrivateInTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.kt");
         }
 
         @Test
         @TestMetadata("PropertyWithoutName.kt")
         public void testPropertyWithoutName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PropertyWithoutName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.kt");
         }
 
         @Test
         @TestMetadata("RepetableAnnotations.kt")
         public void testRepetableAnnotations() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.kt");
         }
 
         @Test
         @TestMetadata("SameName.kt")
         public void testSameName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.kt");
         }
 
         @Test
         @TestMetadata("TopLevelDestructuring.kt")
         public void testTopLevelDestructuring() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.kt");
         }
 
         @Test
         @TestMetadata("TraitClassObjectField.kt")
         public void testTraitClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.kt");
         }
 
         @Test
         @TestMetadata("TwoOverrides.kt")
         public void testTwoOverrides() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.kt");
         }
 
         @Test
         @TestMetadata("WrongAnnotations.kt")
         public void testWrongAnnotations() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/delegation")
     @TestDataPath("$PROJECT_ROOT")
     public class Delegation {
         @Test
         public void testAllFilesPresentInDelegation() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt");
         }
 
         @Test
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/facades")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/facades")
     @TestDataPath("$PROJECT_ROOT")
     public class Facades {
         @Test
         public void testAllFilesPresentInFacades() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/facades"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllPrivate.kt")
         public void testAllPrivate() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt");
         }
 
         @Test
         @TestMetadata("MultiFile.kt")
         public void testMultiFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt");
         }
 
         @Test
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt");
         }
 
         @Test
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/ideRegression")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/ideRegression")
     @TestDataPath("$PROJECT_ROOT")
     public class IdeRegression {
         @Test
         public void testAllFilesPresentInIdeRegression() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/ideRegression"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("AllOpenAnnotatedClasses.kt")
         public void testAllOpenAnnotatedClasses() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt");
         }
 
         @Test
         @TestMetadata("ImplementingCharSequenceAndNumber.kt")
         public void testImplementingCharSequenceAndNumber() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMap.kt")
         public void testImplementingMap() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt");
         }
 
         @Test
         @TestMetadata("ImplementingMutableSet.kt")
         public void testImplementingMutableSet() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt");
         }
 
         @Test
         @TestMetadata("InheritingInterfaceDefaultImpls.kt")
         public void testInheritingInterfaceDefaultImpls() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt");
         }
 
         @Test
         @TestMetadata("OverridingFinalInternal.kt")
         public void testOverridingFinalInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingInternal.kt")
         public void testOverridingInternal() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt");
         }
 
         @Test
         @TestMetadata("OverridingProtected.kt")
         public void testOverridingProtected() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations")
     @TestDataPath("$PROJECT_ROOT")
     public class NullabilityAnnotations {
         @Test
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt");
         }
 
         @Test
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
         }
 
         @Test
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
         }
 
         @Test
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt");
         }
 
         @Test
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt");
         }
 
         @Test
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
         }
 
         @Test
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
         }
 
         @Test
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
         }
 
         @Test
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
         }
 
         @Test
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
         }
 
         @Test
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt");
         }
 
         @Test
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
         }
 
         @Test
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt");
         }
 
         @Test
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt");
         }
 
         @Test
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
         }
 
         @Test
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt");
         }
 
         @Test
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/object")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/object")
     @TestDataPath("$PROJECT_ROOT")
     public class Object {
         @Test
         public void testAllFilesPresentInObject() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/object"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/publicField")
     @TestDataPath("$PROJECT_ROOT")
     public class PublicField {
         @Test
         public void testAllFilesPresentInPublicField() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
 
         @Test
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt");
         }
 
         @Test
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt");
         }
     }
 
     @Nested
-    @TestMetadata("compiler/testData/asJava/lightClasses/script")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/script")
     @TestDataPath("$PROJECT_ROOT")
     public class Script {
         @Test
         public void testAllFilesPresentInScript() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/script"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
         }
     }
 }
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
index 1657e8d3be4..9e6169621dc 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/asJava/lightClasses")
+@TestMetadata("compiler/testData/asJava/lightClasses/lightClasses")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassTest {
@@ -26,195 +26,195 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
     }
 
     public void testAllFilesPresentInLightClasses() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true, "local", "ideRegression");
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true, "local", "ideRegression");
     }
 
     @TestMetadata("AnnotatedParameterInEnumConstructor.kt")
     public void testAnnotatedParameterInEnumConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt");
     }
 
     @TestMetadata("AnnotatedParameterInInnerClassConstructor.kt")
     public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt");
     }
 
     @TestMetadata("AnnotatedPropertyWithSites.kt")
     public void testAnnotatedPropertyWithSites() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt");
     }
 
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt");
     }
 
     @TestMetadata("AnnotationJavaRepeatable.kt")
     public void testAnnotationJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt");
     }
 
     @TestMetadata("AnnotationJvmRepeatable.kt")
     public void testAnnotationJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt");
     }
 
     @TestMetadata("AnnotationKotlinAndJavaRepeatable.kt")
     public void testAnnotationKotlinAndJavaRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt");
     }
 
     @TestMetadata("AnnotationKotlinAndJvmRepeatable.kt")
     public void testAnnotationKotlinAndJvmRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt");
     }
 
     @TestMetadata("AnnotationRepeatable.kt")
     public void testAnnotationRepeatable() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt");
     }
 
     @TestMetadata("Constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Constructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt");
     }
 
     @TestMetadata("DataClassWithCustomImplementedMembers.kt")
     public void testDataClassWithCustomImplementedMembers() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt");
     }
 
     @TestMetadata("DelegatedNested.kt")
     public void testDelegatedNested() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DelegatedNested.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt");
     }
 
     @TestMetadata("Delegation.kt")
     public void testDelegation() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/Delegation.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt");
     }
 
     @TestMetadata("DeprecatedEnumEntry.kt")
     public void testDeprecatedEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt");
     }
 
     @TestMetadata("DeprecatedNotHiddenInClass.kt")
     public void testDeprecatedNotHiddenInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt");
     }
 
     @TestMetadata("DollarsInName.kt")
     public void testDollarsInName() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInName.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt");
     }
 
     @TestMetadata("DollarsInNameNoPackage.kt")
     public void testDollarsInNameNoPackage() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt");
     }
 
     @TestMetadata("EnumClass.kt")
     public void testEnumClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt");
     }
 
     @TestMetadata("EnumClassWithEnumEntries.kt")
     public void testEnumClassWithEnumEntries() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt");
     }
 
     @TestMetadata("EnumEntry.kt")
     public void testEnumEntry() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/EnumEntry.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt");
     }
 
     @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
     public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt");
     }
 
     @TestMetadata("HiddenDeprecated.kt")
     public void testHiddenDeprecated() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt");
     }
 
     @TestMetadata("HiddenDeprecatedInClass.kt")
     public void testHiddenDeprecatedInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt");
     }
 
     @TestMetadata("InheritingInterfaceDefaultImpls.kt")
     public void testInheritingInterfaceDefaultImpls() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt");
     }
 
     @TestMetadata("InlineReified.kt")
     public void testInlineReified() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/InlineReified.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt");
     }
 
     @TestMetadata("JavaBetween.kt")
     public void testJavaBetween() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JavaBetween.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt");
     }
 
     @TestMetadata("JvmNameOnMember.kt")
     public void testJvmNameOnMember() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt");
     }
 
     @TestMetadata("JvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/JvmStatic.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt");
     }
 
     @TestMetadata("LocalFunctions.kt")
     public void testLocalFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/LocalFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt");
     }
 
     @TestMetadata("NestedObjects.kt")
     public void testNestedObjects() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NestedObjects.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt");
     }
 
     @TestMetadata("NonDataClassWithComponentFunctions.kt")
     public void testNonDataClassWithComponentFunctions() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt");
     }
 
     @TestMetadata("OnlySecondaryConstructors.kt")
     public void testOnlySecondaryConstructors() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt");
     }
 
     @TestMetadata("PublishedApi.kt")
     public void testPublishedApi() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/PublishedApi.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt");
     }
 
     @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
     public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt");
     }
 
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt");
     }
 
     @TestMetadata("TypePararametersInClass.kt")
     public void testTypePararametersInClass() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/TypePararametersInClass.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt");
     }
 
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
-        runTest("compiler/testData/asJava/lightClasses/VarArgs.kt");
+        runTest("compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt");
     }
 
-    @TestMetadata("compiler/testData/asJava/lightClasses/compilationErrors")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class CompilationErrors extends AbstractCompilerLightClassTest {
@@ -224,115 +224,115 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
 
         @TestMetadata("ActualClass.kt")
         public void testActualClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.kt");
         }
 
         @TestMetadata("ActualTypeAlias.kt")
         public void testActualTypeAlias() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.kt");
         }
 
         @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt")
         public void testActualTypeAliasCustomJvmPackageName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt");
         }
 
         public void testAllFilesPresentInCompilationErrors() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
         }
 
         @TestMetadata("AllInlineOnly.kt")
         public void testAllInlineOnly() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.kt");
         }
 
         @TestMetadata("AnnotationModifiers.kt")
         public void testAnnotationModifiers() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.kt");
         }
 
         @TestMetadata("EnumNameOverride.kt")
         public void testEnumNameOverride() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.kt");
         }
 
         @TestMetadata("ExpectClass.kt")
         public void testExpectClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.kt");
         }
 
         @TestMetadata("ExpectObject.kt")
         public void testExpectObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.kt");
         }
 
         @TestMetadata("ExpectedNestedClass.kt")
         public void testExpectedNestedClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.kt");
         }
 
         @TestMetadata("ExpectedNestedClassInObject.kt")
         public void testExpectedNestedClassInObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt");
         }
 
         @TestMetadata("FunctionWithoutName.kt")
         public void testFunctionWithoutName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.kt");
         }
 
         @TestMetadata("JvmPackageName.kt")
         public void testJvmPackageName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.kt");
         }
 
         @TestMetadata("LocalInAnnotation.kt")
         public void testLocalInAnnotation() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.kt");
         }
 
         @TestMetadata("PrivateInTrait.kt")
         public void testPrivateInTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.kt");
         }
 
         @TestMetadata("PropertyWithoutName.kt")
         public void testPropertyWithoutName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/PropertyWithoutName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.kt");
         }
 
         @TestMetadata("RepetableAnnotations.kt")
         public void testRepetableAnnotations() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.kt");
         }
 
         @TestMetadata("SameName.kt")
         public void testSameName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.kt");
         }
 
         @TestMetadata("TopLevelDestructuring.kt")
         public void testTopLevelDestructuring() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.kt");
         }
 
         @TestMetadata("TraitClassObjectField.kt")
         public void testTraitClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.kt");
         }
 
         @TestMetadata("TwoOverrides.kt")
         public void testTwoOverrides() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.kt");
         }
 
         @TestMetadata("WrongAnnotations.kt")
         public void testWrongAnnotations() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.kt");
         }
     }
 
-    @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/delegation")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Delegation extends AbstractCompilerLightClassTest {
@@ -341,21 +341,21 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         }
 
         public void testAllFilesPresentInDelegation() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/delegation"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
         }
 
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt");
         }
 
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt");
         }
     }
 
-    @TestMetadata("compiler/testData/asJava/lightClasses/facades")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/facades")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Facades extends AbstractCompilerLightClassTest {
@@ -364,31 +364,31 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         }
 
         public void testAllFilesPresentInFacades() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/facades"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
         }
 
         @TestMetadata("AllPrivate.kt")
         public void testAllPrivate() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt");
         }
 
         @TestMetadata("MultiFile.kt")
         public void testMultiFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/MultiFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt");
         }
 
         @TestMetadata("SingleFile.kt")
         public void testSingleFile() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt");
         }
 
         @TestMetadata("SingleJvmClassName.kt")
         public void testSingleJvmClassName() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt");
         }
     }
 
-    @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class NullabilityAnnotations extends AbstractCompilerLightClassTest {
@@ -397,101 +397,101 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         }
 
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
         }
 
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt");
         }
 
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
         }
 
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
         }
 
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
         }
 
         @TestMetadata("FileFacade.kt")
         public void testFileFacade() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt");
         }
 
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt");
         }
 
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
         }
 
         @TestMetadata("JvmOverloads.kt")
         public void testJvmOverloads() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt");
         }
 
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
         }
 
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
         }
 
         @TestMetadata("PlatformTypes.kt")
         public void testPlatformTypes() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt");
         }
 
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt");
         }
 
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
         }
 
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt");
         }
 
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt");
         }
 
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
         }
 
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt");
         }
 
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt");
         }
     }
 
-    @TestMetadata("compiler/testData/asJava/lightClasses/object")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/object")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Object extends AbstractCompilerLightClassTest {
@@ -500,16 +500,16 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         }
 
         public void testAllFilesPresentInObject() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/object"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
         }
 
         @TestMetadata("SimpleObject.kt")
         public void testSimpleObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/object/SimpleObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt");
         }
     }
 
-    @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/publicField")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PublicField extends AbstractCompilerLightClassTest {
@@ -518,21 +518,21 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         }
 
         public void testAllFilesPresentInPublicField() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/publicField"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
         }
 
         @TestMetadata("CompanionObject.kt")
         public void testCompanionObject() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt");
         }
 
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/publicField/Simple.kt");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt");
         }
     }
 
-    @TestMetadata("compiler/testData/asJava/lightClasses/script")
+    @TestMetadata("compiler/testData/asJava/lightClasses/lightClasses/script")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Script extends AbstractCompilerLightClassTest {
@@ -541,17 +541,17 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         }
 
         public void testAllFilesPresentInScript() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/script"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClasses/script"), Pattern.compile("^([^.]+)\\.(kt|kts)$"), null, true);
         }
 
         @TestMetadata("HelloWorld.kts")
         public void testHelloWorld() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/script/HelloWorld.kts");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.kts");
         }
 
         @TestMetadata("InnerClasses.kts")
         public void testInnerClasses() throws Exception {
-            runTest("compiler/testData/asJava/lightClasses/script/InnerClasses.kts");
+            runTest("compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.kts");
         }
     }
 }