diff --git a/.space/CODEOWNERS b/.space/CODEOWNERS index 1cb8dec9f43..7f22f61aaa4 100644 --- a/.space/CODEOWNERS +++ b/.space/CODEOWNERS @@ -86,14 +86,8 @@ /compiler/test-infrastructure/ "Kotlin Compiler Core" /compiler/test-infrastructure-utils/ "Kotlin Compiler Core" -/compiler/testData/asJava/annotations/ "Kotlin Compiler Core" /compiler/testData/asJava/findClasses/ "Kotlin Compiler Core" /compiler/testData/asJava/lightClasses/ "Kotlin IDE" -/compiler/testData/asJava/lightClassStructure/ "Kotlin IDE" -/compiler/testData/asJava/script/ "Kotlin IDE" -/compiler/testData/asJava/ultraLightClasses/ "Kotlin IDE" -/compiler/testData/asJava/ultraLightFacades/ "Kotlin IDE" -/compiler/testData/asJava/ultraLightScripts/ "Kotlin IDE" /compiler/testData/binaryCompatibility/klibEvolution/ "Kotlin Native" /compiler/testData/builtin-classes/ "Kotlin Libraries" /compiler/testData/capturedTypeApproximation/ "Kotlin Compiler Core" diff --git a/compiler/testData/asJava/annotations/ExtraAnnotations.annotations.txt b/compiler/testData/asJava/lightClasses/annotations/ExtraAnnotations.annotations.txt similarity index 100% rename from compiler/testData/asJava/annotations/ExtraAnnotations.annotations.txt rename to compiler/testData/asJava/lightClasses/annotations/ExtraAnnotations.annotations.txt diff --git a/compiler/testData/asJava/annotations/ExtraAnnotations.kt b/compiler/testData/asJava/lightClasses/annotations/ExtraAnnotations.kt similarity index 100% rename from compiler/testData/asJava/annotations/ExtraAnnotations.kt rename to compiler/testData/asJava/lightClasses/annotations/ExtraAnnotations.kt diff --git a/compiler/testData/asJava/annotations/NestedClass.annotations.txt b/compiler/testData/asJava/lightClasses/annotations/NestedClass.annotations.txt similarity index 100% rename from compiler/testData/asJava/annotations/NestedClass.annotations.txt rename to compiler/testData/asJava/lightClasses/annotations/NestedClass.annotations.txt diff --git a/compiler/testData/asJava/annotations/NestedClass.kt b/compiler/testData/asJava/lightClasses/annotations/NestedClass.kt similarity index 100% rename from compiler/testData/asJava/annotations/NestedClass.kt rename to compiler/testData/asJava/lightClasses/annotations/NestedClass.kt diff --git a/compiler/testData/asJava/lightClassStructure/ClassObject.kt b/compiler/testData/asJava/lightClasses/lightClassStructure/ClassObject.kt similarity index 100% rename from compiler/testData/asJava/lightClassStructure/ClassObject.kt rename to compiler/testData/asJava/lightClasses/lightClassStructure/ClassObject.kt diff --git a/compiler/testData/asJava/lightClassStructure/CodeWithErrors.kt b/compiler/testData/asJava/lightClasses/lightClassStructure/CodeWithErrors.kt similarity index 100% rename from compiler/testData/asJava/lightClassStructure/CodeWithErrors.kt rename to compiler/testData/asJava/lightClasses/lightClassStructure/CodeWithErrors.kt diff --git a/compiler/testData/asJava/lightClassStructure/Declared.kt b/compiler/testData/asJava/lightClasses/lightClassStructure/Declared.kt similarity index 100% rename from compiler/testData/asJava/lightClassStructure/Declared.kt rename to compiler/testData/asJava/lightClasses/lightClassStructure/Declared.kt diff --git a/compiler/testData/asJava/lightClassStructure/DeclaredWithGenerics.kt b/compiler/testData/asJava/lightClasses/lightClassStructure/DeclaredWithGenerics.kt similarity index 100% rename from compiler/testData/asJava/lightClassStructure/DeclaredWithGenerics.kt rename to compiler/testData/asJava/lightClasses/lightClassStructure/DeclaredWithGenerics.kt diff --git a/compiler/testData/asJava/lightClassStructure/Package.kt b/compiler/testData/asJava/lightClasses/lightClassStructure/Package.kt similarity index 100% rename from compiler/testData/asJava/lightClassStructure/Package.kt rename to compiler/testData/asJava/lightClasses/lightClassStructure/Package.kt diff --git a/compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt b/compiler/testData/asJava/lightClasses/lightClassStructure/PlatformStaticMethodsGenerics.kt similarity index 100% rename from compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt rename to compiler/testData/asJava/lightClasses/lightClassStructure/PlatformStaticMethodsGenerics.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.java diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInEnumConstructor.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.java diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotatedParameterInInnerClassConstructor.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.fir.java diff --git a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.java diff --git a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotatedPropertyWithSites.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotationClass.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationClass.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.fir.java diff --git a/compiler/testData/asJava/lightClasses/AnnotationClass.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.java diff --git a/compiler/testData/asJava/lightClasses/AnnotationClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationClass.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationJavaRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationJavaRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationJvmRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJavaRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationKotlinAndJvmRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/AnnotationRepeatable.java b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.java similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationRepeatable.java rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.java diff --git a/compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt b/compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt rename to compiler/testData/asJava/lightClasses/lightClasses/AnnotationRepeatable.kt diff --git a/compiler/testData/asJava/lightClasses/Constructors.java b/compiler/testData/asJava/lightClasses/lightClasses/Constructors.java similarity index 100% rename from compiler/testData/asJava/lightClasses/Constructors.java rename to compiler/testData/asJava/lightClasses/lightClasses/Constructors.java diff --git a/compiler/testData/asJava/lightClasses/Constructors.kt b/compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/Constructors.kt rename to compiler/testData/asJava/lightClasses/lightClasses/Constructors.kt diff --git a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.fir.java diff --git a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java b/compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java rename to compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.java diff --git a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt b/compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt rename to compiler/testData/asJava/lightClasses/lightClasses/DataClassWithCustomImplementedMembers.kt diff --git a/compiler/testData/asJava/lightClasses/DelegatedNested.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DelegatedNested.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.fir.java diff --git a/compiler/testData/asJava/lightClasses/DelegatedNested.java b/compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DelegatedNested.java rename to compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.java diff --git a/compiler/testData/asJava/lightClasses/DelegatedNested.kt b/compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/DelegatedNested.kt rename to compiler/testData/asJava/lightClasses/lightClasses/DelegatedNested.kt diff --git a/compiler/testData/asJava/lightClasses/Delegation.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/Delegation.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/Delegation.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/Delegation.fir.java diff --git a/compiler/testData/asJava/lightClasses/Delegation.java b/compiler/testData/asJava/lightClasses/lightClasses/Delegation.java similarity index 100% rename from compiler/testData/asJava/lightClasses/Delegation.java rename to compiler/testData/asJava/lightClasses/lightClasses/Delegation.java diff --git a/compiler/testData/asJava/lightClasses/Delegation.kt b/compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/Delegation.kt rename to compiler/testData/asJava/lightClasses/lightClasses/Delegation.kt diff --git a/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java b/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java rename to compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.java diff --git a/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt b/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt rename to compiler/testData/asJava/lightClasses/lightClasses/DeprecatedEnumEntry.kt diff --git a/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.java b/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.java diff --git a/compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/DeprecatedNotHiddenInClass.kt diff --git a/compiler/testData/asJava/lightClasses/DollarsInName.java b/compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DollarsInName.java rename to compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.java diff --git a/compiler/testData/asJava/lightClasses/DollarsInName.kt b/compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/DollarsInName.kt rename to compiler/testData/asJava/lightClasses/lightClasses/DollarsInName.kt diff --git a/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.java b/compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.java similarity index 100% rename from compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.java rename to compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.java diff --git a/compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt b/compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt rename to compiler/testData/asJava/lightClasses/lightClasses/DollarsInNameNoPackage.kt diff --git a/compiler/testData/asJava/lightClasses/EnumClass.java b/compiler/testData/asJava/lightClasses/lightClasses/EnumClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/EnumClass.java diff --git a/compiler/testData/asJava/lightClasses/EnumClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/EnumClass.kt diff --git a/compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.java b/compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.java similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.java rename to compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.java diff --git a/compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.kt b/compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumClassWithEnumEntries.kt rename to compiler/testData/asJava/lightClasses/lightClasses/EnumClassWithEnumEntries.kt diff --git a/compiler/testData/asJava/lightClasses/EnumEntry.compiled.java b/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.compiled.java similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumEntry.compiled.java rename to compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.compiled.java diff --git a/compiler/testData/asJava/lightClasses/EnumEntry.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumEntry.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.fir.java diff --git a/compiler/testData/asJava/lightClasses/EnumEntry.java b/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.java similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumEntry.java rename to compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.java diff --git a/compiler/testData/asJava/lightClasses/EnumEntry.kt b/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumEntry.kt rename to compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.kt diff --git a/compiler/testData/asJava/lightClasses/EnumEntry.lib.java b/compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/EnumEntry.lib.java rename to compiler/testData/asJava/lightClasses/lightClasses/EnumEntry.lib.java diff --git a/compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.fir.java diff --git a/compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.java rename to compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.java diff --git a/compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt b/compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ExtendingInterfaceWithDefaultImpls.kt diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecated.java b/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.java similarity index 100% rename from compiler/testData/asJava/lightClasses/HiddenDeprecated.java rename to compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.java diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecated.kt b/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/HiddenDeprecated.kt rename to compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecated.kt diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.java b/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.java diff --git a/compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/HiddenDeprecatedInClass.kt diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.compiled.java b/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.compiled.java similarity index 100% rename from compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.compiled.java rename to compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.compiled.java diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.fir.java diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.java similarity index 100% rename from compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java rename to compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.java diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt b/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt rename to compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.kt diff --git a/compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.lib.java b/compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.lib.java rename to compiler/testData/asJava/lightClasses/lightClasses/InheritingInterfaceDefaultImpls.lib.java diff --git a/compiler/testData/asJava/lightClasses/InlineReified.java b/compiler/testData/asJava/lightClasses/lightClasses/InlineReified.java similarity index 100% rename from compiler/testData/asJava/lightClasses/InlineReified.java rename to compiler/testData/asJava/lightClasses/lightClasses/InlineReified.java diff --git a/compiler/testData/asJava/lightClasses/InlineReified.kt b/compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/InlineReified.kt rename to compiler/testData/asJava/lightClasses/lightClasses/InlineReified.kt diff --git a/compiler/testData/asJava/lightClasses/JavaBetween.java b/compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.java similarity index 100% rename from compiler/testData/asJava/lightClasses/JavaBetween.java rename to compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.java diff --git a/compiler/testData/asJava/lightClasses/JavaBetween.kt b/compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/JavaBetween.kt rename to compiler/testData/asJava/lightClasses/lightClasses/JavaBetween.kt diff --git a/compiler/testData/asJava/lightClasses/JvmNameOnMember.java b/compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.java similarity index 100% rename from compiler/testData/asJava/lightClasses/JvmNameOnMember.java rename to compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.java diff --git a/compiler/testData/asJava/lightClasses/JvmNameOnMember.kt b/compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/JvmNameOnMember.kt rename to compiler/testData/asJava/lightClasses/lightClasses/JvmNameOnMember.kt diff --git a/compiler/testData/asJava/lightClasses/JvmStatic.java b/compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.java similarity index 100% rename from compiler/testData/asJava/lightClasses/JvmStatic.java rename to compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.java diff --git a/compiler/testData/asJava/lightClasses/JvmStatic.kt b/compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/JvmStatic.kt rename to compiler/testData/asJava/lightClasses/lightClasses/JvmStatic.kt diff --git a/compiler/testData/asJava/lightClasses/LocalFunctions.java b/compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.java similarity index 100% rename from compiler/testData/asJava/lightClasses/LocalFunctions.java rename to compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.java diff --git a/compiler/testData/asJava/lightClasses/LocalFunctions.kt b/compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/LocalFunctions.kt rename to compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.kt diff --git a/compiler/testData/asJava/lightClasses/LocalFunctions.lib.java b/compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/LocalFunctions.lib.java rename to compiler/testData/asJava/lightClasses/lightClasses/LocalFunctions.lib.java diff --git a/compiler/testData/asJava/lightClasses/NestedObjects.java b/compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.java similarity index 100% rename from compiler/testData/asJava/lightClasses/NestedObjects.java rename to compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.java diff --git a/compiler/testData/asJava/lightClasses/NestedObjects.kt b/compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/NestedObjects.kt rename to compiler/testData/asJava/lightClasses/lightClasses/NestedObjects.kt diff --git a/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.fir.java diff --git a/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java b/compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.java similarity index 100% rename from compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java rename to compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.java diff --git a/compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt b/compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt rename to compiler/testData/asJava/lightClasses/lightClasses/NonDataClassWithComponentFunctions.kt diff --git a/compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.java b/compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.java similarity index 100% rename from compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.java rename to compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.java diff --git a/compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt b/compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt rename to compiler/testData/asJava/lightClasses/lightClasses/OnlySecondaryConstructors.kt diff --git a/compiler/testData/asJava/lightClasses/PublishedApi.java b/compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.java similarity index 100% rename from compiler/testData/asJava/lightClasses/PublishedApi.java rename to compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.java diff --git a/compiler/testData/asJava/lightClasses/PublishedApi.kt b/compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/PublishedApi.kt rename to compiler/testData/asJava/lightClasses/lightClasses/PublishedApi.kt diff --git a/compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.java b/compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.java diff --git a/compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/SpecialAnnotationsOnAnnotationClass.kt diff --git a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java b/compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.java similarity index 100% rename from compiler/testData/asJava/lightClasses/StubOrderForOverloads.java rename to compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.java diff --git a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt b/compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt rename to compiler/testData/asJava/lightClasses/lightClasses/StubOrderForOverloads.kt diff --git a/compiler/testData/asJava/lightClasses/TypePararametersInClass.java b/compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/TypePararametersInClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.java diff --git a/compiler/testData/asJava/lightClasses/TypePararametersInClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/TypePararametersInClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/TypePararametersInClass.kt diff --git a/compiler/testData/asJava/lightClasses/VarArgs.java b/compiler/testData/asJava/lightClasses/lightClasses/VarArgs.java similarity index 100% rename from compiler/testData/asJava/lightClasses/VarArgs.java rename to compiler/testData/asJava/lightClasses/lightClasses/VarArgs.java diff --git a/compiler/testData/asJava/lightClasses/VarArgs.kt b/compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/VarArgs.kt rename to compiler/testData/asJava/lightClasses/lightClasses/VarArgs.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualClass.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAlias.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.fir.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AllInlineOnly.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.fir.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/AnnotationModifiers.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/EnumNameOverride.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectClass.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectObject.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClass.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.fir.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/FunctionWithoutName.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/FunctionWithoutName.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.fir.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/JvmPackageName.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/LocalInAnnotation.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.fir.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PrivateInTrait.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/PropertyWithoutName.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/PropertyWithoutName.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/PropertyWithoutName.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/PropertyWithoutName.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/PropertyWithoutName.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/RepetableAnnotations.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/SameName.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/SameName.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TopLevelDestructuring.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TraitClassObjectField.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.fir.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/TwoOverrides.kt diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.fir.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.java similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.java diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt b/compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt rename to compiler/testData/asJava/lightClasses/lightClasses/compilationErrors/WrongAnnotations.kt diff --git a/compiler/testData/asJava/lightClasses/delegation/Function.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/Function.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.fir.java diff --git a/compiler/testData/asJava/lightClasses/delegation/Function.java b/compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.java similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/Function.java rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.java diff --git a/compiler/testData/asJava/lightClasses/delegation/Function.kt b/compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/Function.kt rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/Function.kt diff --git a/compiler/testData/asJava/lightClasses/delegation/Property.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/Property.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.fir.java diff --git a/compiler/testData/asJava/lightClasses/delegation/Property.java b/compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.java similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/Property.java rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.java diff --git a/compiler/testData/asJava/lightClasses/delegation/Property.kt b/compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/Property.kt rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/Property.kt diff --git a/compiler/testData/asJava/lightClasses/delegation/WithPlatformTypes.NoCompile.java b/compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/WithPlatformTypes.NoCompile.java rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.java diff --git a/compiler/testData/asJava/lightClasses/delegation/WithPlatformTypes.NoCompile.kt b/compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/delegation/WithPlatformTypes.NoCompile.kt rename to compiler/testData/asJava/lightClasses/lightClasses/delegation/WithPlatformTypes.NoCompile.kt diff --git a/compiler/testData/asJava/lightClasses/facades/AllPrivate.java b/compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.java similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/AllPrivate.java rename to compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.java diff --git a/compiler/testData/asJava/lightClasses/facades/AllPrivate.kt b/compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/AllPrivate.kt rename to compiler/testData/asJava/lightClasses/lightClasses/facades/AllPrivate.kt diff --git a/compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.java b/compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.java rename to compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.java diff --git a/compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.kt b/compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.kt rename to compiler/testData/asJava/lightClasses/lightClasses/facades/EmptyFile.NoCompile.kt diff --git a/compiler/testData/asJava/lightClasses/facades/MultiFile.java b/compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/MultiFile.java rename to compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.java diff --git a/compiler/testData/asJava/lightClasses/facades/MultiFile.kt b/compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/MultiFile.kt rename to compiler/testData/asJava/lightClasses/lightClasses/facades/MultiFile.kt diff --git a/compiler/testData/asJava/lightClasses/facades/SingleFile.java b/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.java similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/SingleFile.java rename to compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.java diff --git a/compiler/testData/asJava/lightClasses/facades/SingleFile.kt b/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/SingleFile.kt rename to compiler/testData/asJava/lightClasses/lightClasses/facades/SingleFile.kt diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java b/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.java similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java rename to compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.java diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt b/compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt rename to compiler/testData/asJava/lightClasses/lightClasses/facades/SingleJvmClassName.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMutableSet.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.lib.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.lib.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.lib.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.lib.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.extra.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.extra.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.extra.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.extra.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingFinalInternal.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.extra.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.extra.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.extra.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.extra.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingInternal.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.extra.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.extra.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.extra.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.extra.kt diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.fir.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.java b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.java similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.java rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.java diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt b/compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt rename to compiler/testData/asJava/lightClasses/lightClasses/ideRegression/OverridingProtected.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Class.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassObjectField.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/FileFacade.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Generic.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.fir.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/IntOverridesAny.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/JvmOverloads.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.fir.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PlatformTypes.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Primitives.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/PrivateInClass.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Synthetic.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/Trait.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.fir.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/UnitParameter.kt diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.java similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.java diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt b/compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt rename to compiler/testData/asJava/lightClasses/lightClasses/nullabilityAnnotations/VoidReturn.kt diff --git a/compiler/testData/asJava/lightClasses/object/SimpleObject.java b/compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/object/SimpleObject.java rename to compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.java diff --git a/compiler/testData/asJava/lightClasses/object/SimpleObject.kt b/compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/object/SimpleObject.kt rename to compiler/testData/asJava/lightClasses/lightClasses/object/SimpleObject.kt diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.java b/compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.java similarity index 100% rename from compiler/testData/asJava/lightClasses/publicField/CompanionObject.java rename to compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.java diff --git a/compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt b/compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt rename to compiler/testData/asJava/lightClasses/lightClasses/publicField/CompanionObject.kt diff --git a/compiler/testData/asJava/lightClasses/publicField/Simple.java b/compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.java similarity index 100% rename from compiler/testData/asJava/lightClasses/publicField/Simple.java rename to compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.java diff --git a/compiler/testData/asJava/lightClasses/publicField/Simple.kt b/compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt similarity index 100% rename from compiler/testData/asJava/lightClasses/publicField/Simple.kt rename to compiler/testData/asJava/lightClasses/lightClasses/publicField/Simple.kt diff --git a/compiler/testData/asJava/lightClasses/script/HelloWorld.java b/compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.java similarity index 100% rename from compiler/testData/asJava/lightClasses/script/HelloWorld.java rename to compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.java diff --git a/compiler/testData/asJava/lightClasses/script/HelloWorld.kts b/compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.kts similarity index 100% rename from compiler/testData/asJava/lightClasses/script/HelloWorld.kts rename to compiler/testData/asJava/lightClasses/lightClasses/script/HelloWorld.kts diff --git a/compiler/testData/asJava/lightClasses/script/InnerClasses.java b/compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.java similarity index 100% rename from compiler/testData/asJava/lightClasses/script/InnerClasses.java rename to compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.java diff --git a/compiler/testData/asJava/lightClasses/script/InnerClasses.kts b/compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.kts similarity index 100% rename from compiler/testData/asJava/lightClasses/script/InnerClasses.kts rename to compiler/testData/asJava/lightClasses/lightClasses/script/InnerClasses.kts diff --git a/compiler/testData/asJava/script/ide/HelloWorld.java b/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.java similarity index 100% rename from compiler/testData/asJava/script/ide/HelloWorld.java rename to compiler/testData/asJava/lightClasses/script/ide/HelloWorld.java diff --git a/compiler/testData/asJava/script/ide/HelloWorld.kts b/compiler/testData/asJava/lightClasses/script/ide/HelloWorld.kts similarity index 100% rename from compiler/testData/asJava/script/ide/HelloWorld.kts rename to compiler/testData/asJava/lightClasses/script/ide/HelloWorld.kts diff --git a/compiler/testData/asJava/script/ide/InnerClasses.java b/compiler/testData/asJava/lightClasses/script/ide/InnerClasses.java similarity index 100% rename from compiler/testData/asJava/script/ide/InnerClasses.java rename to compiler/testData/asJava/lightClasses/script/ide/InnerClasses.java diff --git a/compiler/testData/asJava/script/ide/InnerClasses.kts b/compiler/testData/asJava/lightClasses/script/ide/InnerClasses.kts similarity index 100% rename from compiler/testData/asJava/script/ide/InnerClasses.kts rename to compiler/testData/asJava/lightClasses/script/ide/InnerClasses.kts diff --git a/compiler/testData/asJava/ultraLightClasses/LateinitProperties.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/LateinitProperties.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.java diff --git a/compiler/testData/asJava/ultraLightClasses/LateinitProperties.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/LateinitProperties.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.kt diff --git a/compiler/testData/asJava/ultraLightClasses/LateinitProperties.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/LateinitProperties.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/LateinitProperties.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.java diff --git a/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.kt diff --git a/compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/annotationWithSetParamPropertyModifier.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/annotations.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/annotations.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/annotations.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/annotations.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.java diff --git a/compiler/testData/asJava/ultraLightClasses/annotations.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/annotations.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/annotations.kt diff --git a/compiler/testData/asJava/ultraLightClasses/classModifiers.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/classModifiers.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.java diff --git a/compiler/testData/asJava/ultraLightClasses/classModifiers.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/classModifiers.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.kt diff --git a/compiler/testData/asJava/ultraLightClasses/classModifiers.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/classModifiers.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/classModifiers.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/constructors.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/constructors.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/constructors.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/constructors.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.java diff --git a/compiler/testData/asJava/ultraLightClasses/constructors.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/constructors.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.kt diff --git a/compiler/testData/asJava/ultraLightClasses/constructors.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/constructors.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/constructors.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/coroutines.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/coroutines.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/coroutines.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/coroutines.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.java diff --git a/compiler/testData/asJava/ultraLightClasses/coroutines.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/coroutines.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.kt diff --git a/compiler/testData/asJava/ultraLightClasses/coroutines.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/coroutines.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/coroutines.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/dataClasses.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/dataClasses.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.java diff --git a/compiler/testData/asJava/ultraLightClasses/dataClasses.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/dataClasses.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.kt diff --git a/compiler/testData/asJava/ultraLightClasses/dataClasses.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/dataClasses.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/dataClasses.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.java diff --git a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt diff --git a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.java diff --git a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt diff --git a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.java diff --git a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.kt diff --git a/compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/delegatesWithAnnotations.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.java diff --git a/compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/delegatingToInterfaces.kt diff --git a/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.java diff --git a/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.kt diff --git a/compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/dollarsInNameLocal.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/enums.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/enums.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/enums.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/enums.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/enums.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/enums.java diff --git a/compiler/testData/asJava/ultraLightClasses/enums.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/enums.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/enums.kt diff --git a/compiler/testData/asJava/ultraLightClasses/enums.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/enums.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/enums.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/enums.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/generics.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/generics.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/generics.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/generics.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/generics.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/generics.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/generics.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/generics.java diff --git a/compiler/testData/asJava/ultraLightClasses/generics.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/generics.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/generics.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/generics.kt diff --git a/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.java diff --git a/compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/implementingKotlinCollections.kt diff --git a/compiler/testData/asJava/ultraLightClasses/importAliases.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/importAliases.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.java diff --git a/compiler/testData/asJava/ultraLightClasses/importAliases.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/importAliases.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/importAliases.kt diff --git a/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.java diff --git a/compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inferringAnonymousObjectTypes.kt diff --git a/compiler/testData/asJava/ultraLightClasses/inheritance.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inheritance.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/inheritance.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inheritance.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.java diff --git a/compiler/testData/asJava/ultraLightClasses/inheritance.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inheritance.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inheritance.kt diff --git a/compiler/testData/asJava/ultraLightClasses/inlineClasses.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineClasses.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/inlineClasses.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineClasses.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.java diff --git a/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineClasses.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineClasses.kt diff --git a/compiler/testData/asJava/ultraLightClasses/inlineOnly.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineOnly.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/inlineOnly.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineOnly.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.java diff --git a/compiler/testData/asJava/ultraLightClasses/inlineOnly.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineOnly.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineOnly.kt diff --git a/compiler/testData/asJava/ultraLightClasses/inlineReified.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineReified.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.java diff --git a/compiler/testData/asJava/ultraLightClasses/inlineReified.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/inlineReified.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/inlineReified.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmField.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmField.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmField.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmField.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmField.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmField.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmField.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmName.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmName.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmName.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmName.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmName.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmOverloads.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmOverloads.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmOverloads.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmOverloads.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmRecord.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmRecord.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmRecord.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmRecord.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmRecord.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmRecord.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmRecord.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmRecord.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmRecord.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmStaticOnPropertySetter.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmStaticOnPropertySetter.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmSynthetic.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmSynthetic.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSynthetic.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmSyntheticForAccessors.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.java diff --git a/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.kt diff --git a/compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/jvmWildcardAnnotations.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/lateinitProperty.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/lateinitProperty.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/lateinitProperty.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/lateinitProperty.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.java diff --git a/compiler/testData/asJava/ultraLightClasses/lateinitProperty.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/lateinitProperty.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/lateinitProperty.kt diff --git a/compiler/testData/asJava/ultraLightClasses/localClassDerived.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/localClassDerived.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/localClassDerived.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/localClassDerived.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.java diff --git a/compiler/testData/asJava/ultraLightClasses/localClassDerived.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/localClassDerived.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/localClassDerived.kt diff --git a/compiler/testData/asJava/ultraLightClasses/objects.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/objects.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/objects.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/objects.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/objects.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/objects.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/objects.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/objects.java diff --git a/compiler/testData/asJava/ultraLightClasses/objects.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/objects.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/objects.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/objects.kt diff --git a/compiler/testData/asJava/ultraLightClasses/properties.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/properties.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/properties.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/properties.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/properties.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/properties.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/properties.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/properties.java diff --git a/compiler/testData/asJava/ultraLightClasses/properties.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/properties.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/properties.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/properties.kt diff --git a/compiler/testData/asJava/ultraLightClasses/simpleFunctions.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/simpleFunctions.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/simpleFunctions.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/simpleFunctions.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.java diff --git a/compiler/testData/asJava/ultraLightClasses/simpleFunctions.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/simpleFunctions.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/simpleFunctions.kt diff --git a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/throwsAnnotation.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/throwsAnnotation.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.java diff --git a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.kt diff --git a/compiler/testData/asJava/ultraLightClasses/throwsAnnotation.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/throwsAnnotation.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/throwsAnnotation.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/typeAliases.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/typeAliases.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.java diff --git a/compiler/testData/asJava/ultraLightClasses/typeAliases.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/typeAliases.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.kt diff --git a/compiler/testData/asJava/ultraLightClasses/typeAliases.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/typeAliases.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/typeAliases.lib.java diff --git a/compiler/testData/asJava/ultraLightClasses/typeAnnotations.fir.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/typeAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.fir.java diff --git a/compiler/testData/asJava/ultraLightClasses/typeAnnotations.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/typeAnnotations.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.java diff --git a/compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/typeAnnotations.kt diff --git a/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/wildcardOptimization.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.java diff --git a/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt b/compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.kt similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt rename to compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.kt diff --git a/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.lib.java b/compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightClasses/wildcardOptimization.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightClasses/wildcardOptimization.lib.java diff --git a/compiler/testData/asJava/ultraLightFacades/coroutines.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/coroutines.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.java diff --git a/compiler/testData/asJava/ultraLightFacades/coroutines.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/coroutines.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/coroutines.kt diff --git a/compiler/testData/asJava/ultraLightFacades/importAliases.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/importAliases.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.java diff --git a/compiler/testData/asJava/ultraLightFacades/importAliases.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/importAliases.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/importAliases.kt diff --git a/compiler/testData/asJava/ultraLightFacades/inlineOnly.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/inlineOnly.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/inlineOnly.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/inlineOnly.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.java diff --git a/compiler/testData/asJava/ultraLightFacades/inlineOnly.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/inlineOnly.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/inlineOnly.kt diff --git a/compiler/testData/asJava/ultraLightFacades/jvmField.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmField.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/jvmField.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmField.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.java diff --git a/compiler/testData/asJava/ultraLightFacades/jvmField.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmField.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmField.kt diff --git a/compiler/testData/asJava/ultraLightFacades/jvmName.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmName.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.java diff --git a/compiler/testData/asJava/ultraLightFacades/jvmName.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmName.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmName.kt diff --git a/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.java diff --git a/compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/jvmWildcardAnnotations.kt diff --git a/compiler/testData/asJava/ultraLightFacades/lateinitProperty.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/lateinitProperty.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/lateinitProperty.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/lateinitProperty.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.java diff --git a/compiler/testData/asJava/ultraLightFacades/lateinitProperty.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/lateinitProperty.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/lateinitProperty.kt diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacade.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacade.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacade.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacade.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.java diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacade.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacade.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacade.kt.1 b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt.1 similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacade.kt.1 rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.kt.1 diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacade.lib.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacade.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacade.lib.java diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.java diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt.1 b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt.1 similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt.1 rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.kt.1 diff --git a/compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.lib.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/multifileFacadeJvmName.lib.java diff --git a/compiler/testData/asJava/ultraLightFacades/properties.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/properties.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/properties.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/properties.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/properties.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/properties.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/properties.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/properties.java diff --git a/compiler/testData/asJava/ultraLightFacades/properties.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/properties.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/properties.kt diff --git a/compiler/testData/asJava/ultraLightFacades/script.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/script.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/script.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/script.java diff --git a/compiler/testData/asJava/ultraLightFacades/script.kts b/compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/script.kts rename to compiler/testData/asJava/lightClasses/ultraLightFacades/script.kts diff --git a/compiler/testData/asJava/ultraLightFacades/simpleFunctions.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/simpleFunctions.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/simpleFunctions.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/simpleFunctions.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.java diff --git a/compiler/testData/asJava/ultraLightFacades/simpleFunctions.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/simpleFunctions.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/simpleFunctions.kt diff --git a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.fir.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.fir.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/throwsAnnotation.fir.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.fir.java diff --git a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/throwsAnnotation.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.java diff --git a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.kt diff --git a/compiler/testData/asJava/ultraLightFacades/throwsAnnotation.lib.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.lib.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/throwsAnnotation.lib.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/throwsAnnotation.lib.java diff --git a/compiler/testData/asJava/ultraLightFacades/wildcardOptimization.java b/compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.java similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/wildcardOptimization.java rename to compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.java diff --git a/compiler/testData/asJava/ultraLightFacades/wildcardOptimization.kt b/compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt similarity index 100% rename from compiler/testData/asJava/ultraLightFacades/wildcardOptimization.kt rename to compiler/testData/asJava/lightClasses/ultraLightFacades/wildcardOptimization.kt diff --git a/compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.java b/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java similarity index 100% rename from compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.java rename to compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.java diff --git a/compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.kts b/compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.kts similarity index 100% rename from compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.kts rename to compiler/testData/asJava/lightClasses/ultraLightScripts/FunsPropsAndFields.kts diff --git a/compiler/testData/asJava/ultraLightScripts/HelloWorld.java b/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java similarity index 100% rename from compiler/testData/asJava/ultraLightScripts/HelloWorld.java rename to compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.java diff --git a/compiler/testData/asJava/ultraLightScripts/HelloWorld.kts b/compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.kts similarity index 100% rename from compiler/testData/asJava/ultraLightScripts/HelloWorld.kts rename to compiler/testData/asJava/lightClasses/ultraLightScripts/HelloWorld.kts diff --git a/compiler/testData/asJava/ultraLightScripts/InnerClasses.java b/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java similarity index 100% rename from compiler/testData/asJava/ultraLightScripts/InnerClasses.java rename to compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.java diff --git a/compiler/testData/asJava/ultraLightScripts/InnerClasses.kts b/compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.kts similarity index 100% rename from compiler/testData/asJava/ultraLightScripts/InnerClasses.kts rename to compiler/testData/asJava/lightClasses/ultraLightScripts/InnerClasses.kts diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt index 78c90299eca..9719bf6c424 100644 --- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt +++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt @@ -282,7 +282,11 @@ fun generateJUnit3CompilerTests(args: Array) { } testClass { - model("asJava/lightClasses", excludeDirs = listOf("local", "ideRegression"), pattern = KT_OR_KTS_WITHOUT_DOTS_IN_NAME) + model( + "asJava/lightClasses/lightClasses", + excludeDirs = listOf("local", "ideRegression"), + pattern = KT_OR_KTS_WITHOUT_DOTS_IN_NAME, + ) } testClass { diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java index 977296f00e0..a000b24ced0 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java @@ -42,7 +42,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase @Override protected List getKotlinSourceRoots() { return Collections.singletonList( - new File("compiler/testData/asJava/lightClassStructure/Declared.kt") + new File("compiler/testData/asJava/lightClasses/lightClassStructure/Declared.kt") ); } @@ -102,7 +102,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase @Override protected List getKotlinSourceRoots() { return Collections.singletonList( - new File("compiler/testData/asJava/lightClassStructure/DeclaredWithGenerics.kt") + new File("compiler/testData/asJava/lightClasses/lightClassStructure/DeclaredWithGenerics.kt") ); } @@ -129,7 +129,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase @Override protected List getKotlinSourceRoots() { return Collections.singletonList( - new File("compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt") + new File("compiler/testData/asJava/lightClasses/lightClassStructure/PlatformStaticMethodsGenerics.kt") ); } @@ -156,7 +156,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase @Override protected List getKotlinSourceRoots() { return Collections.singletonList( - new File("compiler/testData/asJava/lightClassStructure/Package.kt") + new File("compiler/testData/asJava/lightClasses/lightClassStructure/Package.kt") ); } @@ -168,7 +168,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase public static class CodeWithErrors extends KotlinLightClassStructureTest { @Override protected List getKotlinSourceRoots() { - return Collections.singletonList(new File("compiler/testData/asJava/lightClassStructure/CodeWithErrors.kt")); + return Collections.singletonList(new File("compiler/testData/asJava/lightClasses/lightClassStructure/CodeWithErrors.kt")); } public void testClassWithErrors() { diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt index 62f2d58e2bd..0d476a1a900 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTest.kt @@ -13,8 +13,8 @@ import java.io.File class KotlinLightClassTest : KotlinAsJavaTestBase() { override fun getKotlinSourceRoots(): List = listOf( - File("compiler/testData/asJava/lightClassStructure/ClassObject.kt"), - File("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt") + File("compiler/testData/asJava/lightClasses/lightClassStructure/ClassObject.kt"), + File("compiler/testData/asJava/lightClasses/lightClasses/ideRegression/ImplementingMap.kt") ) private val key = Key.create("testKey") diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index 4043a7eec5e..5172ac7148e 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java @@ -32,7 +32,7 @@ import java.util.Collections; import java.util.List; public class LightClassAnnotationsTest extends KotlinAsJavaTestBase { - private final File testDir = new File("compiler/testData/asJava/annotations"); + private final File testDir = new File("compiler/testData/asJava/lightClasses/annotations"); @Override protected List getKotlinSourceRoots() { diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt index f8fa91e69fa..bbd701e55c5 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt @@ -18,14 +18,14 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { run { testClass { model( - "asJava/lightClasses", + "asJava/lightClasses/lightClasses", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) } testClass { model( - "asJava/lightClasses", + "asJava/lightClasses/lightClasses", excludeDirs = listOf("compilationErrors"), pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) @@ -33,14 +33,14 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { testClass { model( - "asJava/lightClasses", + "asJava/lightClasses/lightClasses", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) } testClass { model( - "asJava/lightClasses", + "asJava/lightClasses/lightClasses", excludeDirs = listOf("compilationErrors"), pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME ) @@ -49,21 +49,21 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() { run { testClass { - model("asJava/ultraLightClasses", pattern = TestGeneratorUtil.KT_OR_KTS) + model("asJava/lightClasses/ultraLightClasses", pattern = TestGeneratorUtil.KT_OR_KTS) } testClass { - model("asJava/ultraLightClasses", pattern = TestGeneratorUtil.KT_OR_KTS) + model("asJava/lightClasses/ultraLightClasses", pattern = TestGeneratorUtil.KT_OR_KTS) } } run { testClass { - model("asJava/ultraLightFacades", pattern = TestGeneratorUtil.KT_OR_KTS) + model("asJava/lightClasses/ultraLightFacades", pattern = TestGeneratorUtil.KT_OR_KTS) } testClass { - model("asJava/ultraLightFacades", pattern = TestGeneratorUtil.KT_OR_KTS) + model("asJava/lightClasses/ultraLightFacades", pattern = TestGeneratorUtil.KT_OR_KTS) } } } diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts index 3f26ea55d8a..2bff59cd557 100644 --- a/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts @@ -8,10 +8,6 @@ idePluginDependency { jar.apply { listOf( "compiler/testData/asJava/lightClasses", - "compiler/testData/asJava/script", - "compiler/testData/asJava/ultraLightClasses", - "compiler/testData/asJava/ultraLightFacades", - "compiler/testData/asJava/ultraLightScripts", "compiler/testData/loadJava/compiledKotlin", "compiler/fir/analysis-tests/testData/resolve", "compiler/fir/analysis-tests/testData/resolveWithStdlib",