diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationInArray.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationInArray.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInArray.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationOnTypeParameter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/AnnotationOnTypeParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationOnTypeParameter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/AnnotationOnTypeParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/ClassLiteralArguments.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt b/compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/PrimitiveArrayArguments.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/PrimitiveArrayArguments.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Function.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/DataClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/DataClass.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Retention.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Retention.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Simple.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Simple.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/ClassLiteralArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/DefinitelyNotNull.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/DefinitelyNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/DefinitelyNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/DefinitelyNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SourceRetention.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/SourceRetention.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/DelegateTarget.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt rename to compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/Class.txt b/compiler/testData/loadJava/compiledKotlin/class/Class.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/Class.txt rename to compiler/testData/loadJava/compiledKotlin/class/Class.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInParam.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassInParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInParam.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassInParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInnerClass.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInnerClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassMemberConflict.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassMemberConflict.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassOutParam.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassOutParam.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParam.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParam.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassTwoParams.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassTwoParams.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassTwoParams2.txt b/compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassTwoParams2.txt rename to compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/FunInterface.txt b/compiler/testData/loadJava/compiledKotlin/class/FunInterface.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/FunInterface.txt rename to compiler/testData/loadJava/compiledKotlin/class/FunInterface.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritClassSimple.txt b/compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritClassSimple.txt rename to compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritClassWithParam.txt b/compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritClassWithParam.txt rename to compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt b/compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt rename to compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt b/compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt rename to compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt b/compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt rename to compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt b/compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerGenericClass.txt b/compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerGenericClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerTypes.txt b/compiler/testData/loadJava/compiledKotlin/class/InnerTypes.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerTypes.txt rename to compiler/testData/loadJava/compiledKotlin/class/InnerTypes.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObject.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObject.txt rename to compiler/testData/loadJava/compiledKotlin/class/NamedObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClass.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt rename to compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt rename to compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClass.txt b/compiler/testData/loadJava/compiledKotlin/class/NestedClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/NestedClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt b/compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedGenericClass.txt b/compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedGenericClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/RecursiveGeneric.txt b/compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/RecursiveGeneric.txt rename to compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SealedClass.txt b/compiler/testData/loadJava/compiledKotlin/class/SealedClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SealedClass.txt rename to compiler/testData/loadJava/compiledKotlin/class/SealedClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SingleAbstractMethod.txt b/compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SingleAbstractMethod.txt rename to compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/Trait.txt b/compiler/testData/loadJava/compiledKotlin/class/Trait.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/Trait.txt rename to compiler/testData/loadJava/compiledKotlin/class/Trait.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt rename to compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanAbstractGetter.txt b/compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanAbstractGetter.txt rename to compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt b/compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt rename to compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt b/compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt rename to compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt rename to compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt b/compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt rename to compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt b/compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt rename to compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt b/compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt rename to compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt b/compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt rename to compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt b/compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt rename to compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/TraitOpenFun.txt b/compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classFun/TraitOpenFun.txt rename to compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt b/compiler/testData/loadJava/compiledKotlin/classObject/Delegation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/Delegation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt b/compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor0.txt b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor0.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor1.txt b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor1.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt b/compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt b/compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt b/compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt b/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt b/compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt rename to compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/contextReceivers/SimpleContextReceivers.txt b/compiler/testData/loadJava/compiledKotlin/contextReceivers/SimpleContextReceivers.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/contextReceivers/SimpleContextReceivers.txt rename to compiler/testData/loadJava/compiledKotlin/contextReceivers/SimpleContextReceivers.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/coroutines/Basic.txt b/compiler/testData/loadJava/compiledKotlin/coroutines/Basic.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/coroutines/Basic.txt rename to compiler/testData/loadJava/compiledKotlin/coroutines/Basic.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/coroutines/TypeAliasFTSuspendWithReceiver.txt b/compiler/testData/loadJava/compiledKotlin/coroutines/TypeAliasFTSuspendWithReceiver.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/coroutines/TypeAliasFTSuspendWithReceiver.txt rename to compiler/testData/loadJava/compiledKotlin/coroutines/TypeAliasFTSuspendWithReceiver.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/MixedComponents.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/MixedComponents.txt rename to compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/OneVal.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/OneVal.txt rename to compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/TwoVals.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/TwoVals.txt rename to compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/TwoVars.txt b/compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/dataClass/TwoVars.txt rename to compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MyException.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/MyException.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/Simple.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/Simple.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt rename to compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/Assert.txt b/compiler/testData/loadJava/compiledKotlin/fun/Assert.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/Assert.txt rename to compiler/testData/loadJava/compiledKotlin/fun/Assert.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt b/compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt rename to compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InfixKeyword.txt b/compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InfixKeyword.txt rename to compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.txt b/compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.txt rename to compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InheritValAndVar.txt b/compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InheritValAndVar.txt rename to compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InheritValsDifferentTypes.txt b/compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/InheritValsDifferentTypes.txt rename to compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/NoSamAdapter.txt b/compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/NoSamAdapter.txt rename to compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/NoSamConstructor.txt b/compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/NoSamConstructor.txt rename to compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/OperatorKeyword.txt b/compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/OperatorKeyword.txt rename to compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt b/compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt rename to compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt b/compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt rename to compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunGenericParam.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParam.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt rename to compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ExtFun.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ExtFun.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunDefaultArg.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunDefaultArg.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunParamNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunVarargInt.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/FunVarargInteger.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/NsFun.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/NsFun.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/NsFunGetFoo.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/NsFunGetFoo.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNotNull.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt rename to compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt b/compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt rename to compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/vararg/VarargString.txt b/compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/vararg/VarargString.txt rename to compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ClassVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/ClassVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ClassVal.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ClassVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ClassValAbstract.txt b/compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ClassValAbstract.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ClassVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/ClassVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ClassVar.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ClassVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/CollectionSize.txt b/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/CollectionSize.txt rename to compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt b/compiler/testData/loadJava/compiledKotlin/prop/Const.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt rename to compiler/testData/loadJava/compiledKotlin/prop/Const.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Constants.txt b/compiler/testData/loadJava/compiledKotlin/prop/Constants.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Constants.txt rename to compiler/testData/loadJava/compiledKotlin/prop/Constants.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValInt.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValInt.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntCharSequence.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntCharSequence.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntCharSequenceQ.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarInt.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarInt.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarMapPQInt.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarMapPQInt.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarl.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/ExtVarl.txt rename to compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NsVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/NsVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NsVal.txt rename to compiler/testData/loadJava/compiledKotlin/prop/NsVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NsVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/NsVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NsVar.txt rename to compiler/testData/loadJava/compiledKotlin/prop/NsVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/OverrideClassVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/OverrideClassVal.txt rename to compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt rename to compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt b/compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt rename to compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/TraitFinalVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/TraitFinalVar.txt rename to compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/TraitOpenVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/TraitOpenVal.txt rename to compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt rename to compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/VarWithDelegated.txt b/compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/VarWithDelegated.txt rename to compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ExtValLong.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ExtValLong.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ExtVarLong.txt b/compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/defaultAccessors/ExtVarLong.txt rename to compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Any.txt b/compiler/testData/loadJava/compiledKotlin/type/Any.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Any.txt rename to compiler/testData/loadJava/compiledKotlin/type/Any.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/AnyQ.txt b/compiler/testData/loadJava/compiledKotlin/type/AnyQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/AnyQ.txt rename to compiler/testData/loadJava/compiledKotlin/type/AnyQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfInNumber.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfInNumber.txt rename to compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfInt.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfInt.txt rename to compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfInteger.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfInteger.txt rename to compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfOutNumber.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfOutNumber.txt rename to compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfOutT.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfOutT.txt rename to compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfString.txt b/compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ArrayOfString.txt rename to compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Function1IntString.txt b/compiler/testData/loadJava/compiledKotlin/type/Function1IntString.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Function1IntString.txt rename to compiler/testData/loadJava/compiledKotlin/type/Function1IntString.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Int.txt b/compiler/testData/loadJava/compiledKotlin/type/Int.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Int.txt rename to compiler/testData/loadJava/compiledKotlin/type/Int.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/IntArray.txt b/compiler/testData/loadJava/compiledKotlin/type/IntArray.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/IntArray.txt rename to compiler/testData/loadJava/compiledKotlin/type/IntArray.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/IntQ.txt b/compiler/testData/loadJava/compiledKotlin/type/IntQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/IntQ.txt rename to compiler/testData/loadJava/compiledKotlin/type/IntQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfAny.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfAny.txt rename to compiler/testData/loadJava/compiledKotlin/type/ListOfAny.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfAnyQ.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfAnyQ.txt rename to compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfStar.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfStar.txt rename to compiler/testData/loadJava/compiledKotlin/type/ListOfStar.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfString.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfString.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfString.txt rename to compiler/testData/loadJava/compiledKotlin/type/ListOfString.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfjlString.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/ListOfjlString.txt rename to compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Nothing.txt b/compiler/testData/loadJava/compiledKotlin/type/Nothing.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Nothing.txt rename to compiler/testData/loadJava/compiledKotlin/type/Nothing.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/NothingQ.txt b/compiler/testData/loadJava/compiledKotlin/type/NothingQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/NothingQ.txt rename to compiler/testData/loadJava/compiledKotlin/type/NothingQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/String.txt b/compiler/testData/loadJava/compiledKotlin/type/String.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/String.txt rename to compiler/testData/loadJava/compiledKotlin/type/String.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/StringQ.txt b/compiler/testData/loadJava/compiledKotlin/type/StringQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/StringQ.txt rename to compiler/testData/loadJava/compiledKotlin/type/StringQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/SuspendFunction.txt b/compiler/testData/loadJava/compiledKotlin/type/SuspendFunction.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/SuspendFunction.txt rename to compiler/testData/loadJava/compiledKotlin/type/SuspendFunction.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Unit.txt b/compiler/testData/loadJava/compiledKotlin/type/Unit.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Unit.txt rename to compiler/testData/loadJava/compiledKotlin/type/Unit.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Annotations.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Annotations.txt rename to compiler/testData/loadJava/compiledKotlin/typealias/Annotations.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Basic.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Basic.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Basic.txt rename to compiler/testData/loadJava/compiledKotlin/typealias/Basic.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Generic.txt b/compiler/testData/loadJava/compiledKotlin/typealias/Generic.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/Generic.txt rename to compiler/testData/loadJava/compiledKotlin/typealias/Generic.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt b/compiler/testData/loadJava/compiledKotlin/typealias/TypeAliasToExtension.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt rename to compiler/testData/loadJava/compiledKotlin/typealias/TypeAliasToExtension.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/InternalClass.txt b/compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/InternalClass.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/InternalConstructor.txt b/compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/InternalConstructor.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/InternalTopLevelMembers.txt b/compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/InternalTopLevelMembers.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateClass.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateClass.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateToThis.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateToThis.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateTopLevelFun.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateTopLevelFun.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateTopLevelVal.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PrivateTopLevelVal.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt b/compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/TopLevelVarWithPrivateSetter.txt b/compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/visibility/TopLevelVarWithPrivateSetter.txt rename to compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/AnnotationInAnnotationArguments.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/EnumArgumentWithCustomToString.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/classMembers/EnumEntry.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/annotations/parameters/EnumConstructor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithGenericConstructorParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/class/EnumWithPrimitiveConstructorParameter.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/classObject/ClassObjectInClassStaticFields.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/classObject/ClassObjectInClassStaticFields.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/classObject/ClassObjectInTraitStaticFields.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/classObject/ClassObjectInTraitStaticFields.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumVisibility.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/EnumVisibility.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumVisibility.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/EnumVisibility.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/EnumWithConstuctor.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/EnumWithConstuctor.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/EnumWithInnerClasses.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/EnumWithInnerClasses.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnum.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/InnerEnum.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnum.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/InnerEnum.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/InnerEnumExistingClassObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/InnerEnumExistingClassObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/SimpleEnum.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/enum/SimpleEnum.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/SimpleEnum.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/enum/SimpleEnum.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/ClassObjectAnnotation.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/ClassObjectAnnotation.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/Enum.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/Enum.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/Enum.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/Enum.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/GenericFunction.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/GenericFunction.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/GenericFunction.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/GenericFunction.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/ObjectInClass.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/ObjectInClass.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/ObjectMembers.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/ObjectMembers.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/PackageLevelObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fromLoadJava/PackageLevelObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/vararg/NonLastVararg.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/fun/vararg/NonLastVararg.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/fun/vararg/NonLastVararg.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/fun/vararg/NonLastVararg.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/inline/InlineFunction.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/inline/InlineFunction.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/inline/InlineFunction.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/inline/InlineFunction.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/CallablesNameClash.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/CallablesNameClash.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/EnumEntries.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/EnumEntries.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/ExtensionMembers.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/ExtensionMembers.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/ExtensionPropertiesNameClash.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/ExtensionPropertiesNameClash.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/InnerClasses.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/InnerClasses.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/TopLevelCallables.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/TopLevelCallables.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/TopLevelCallables.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/memberOrder/TopLevelCallables.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/nested/DeepInnerGeneric.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/nested/DeepInnerGeneric.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/nested/InnerClassReferencesOuterTP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/nested/InnerClassReferencesOuterTP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/nested/MembersReferenceOuterTP.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/nested/MembersReferenceOuterTP.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformTypes/NotnullTypeArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/platformTypes/NotnullTypeArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/platformTypes/NullableTypeArgument.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/platformTypes/NullableTypeArgument.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/prop/NonConstValWithConstantValueAttribute.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/prop/NonConstValWithConstantValueAttribute.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlInteger.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlInteger.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlInteger.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlInteger.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlIntegerQ.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlIntegerQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlIntegerQ.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlIntegerQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlNumber.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlNumber.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlNumber.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlNumber.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlObject.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlObject.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlObject.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlObject.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlObjectQ.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlObjectQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlObjectQ.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlObjectQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlString.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlString.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlString.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlString.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlStringQ.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlStringQ.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/JlStringQ.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/JlStringQ.fir.txt diff --git a/compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/type/Platform.fir.txt similarity index 100% rename from compiler/fir/analysis-tests/testData/loadCompiledKotlin/type/Platform.txt rename to compiler/testData/loadJava/compiledKotlinWithStdlib/type/Platform.fir.txt