diff --git a/compiler/testData/readJavaBinaryClass/ArrayTypeVariance.java b/compiler/testData/loadJava/ArrayTypeVariance.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ArrayTypeVariance.java
rename to compiler/testData/loadJava/ArrayTypeVariance.java
diff --git a/compiler/testData/readJavaBinaryClass/ArrayTypeVariance.kt b/compiler/testData/loadJava/ArrayTypeVariance.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ArrayTypeVariance.kt
rename to compiler/testData/loadJava/ArrayTypeVariance.kt
diff --git a/compiler/testData/readJavaBinaryClass/ArrayTypeVariance.txt b/compiler/testData/loadJava/ArrayTypeVariance.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ArrayTypeVariance.txt
rename to compiler/testData/loadJava/ArrayTypeVariance.txt
diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java b/compiler/testData/loadJava/ClassDoesNotOverrideMethod.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java
rename to compiler/testData/loadJava/ClassDoesNotOverrideMethod.java
diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.kt b/compiler/testData/loadJava/ClassDoesNotOverrideMethod.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.kt
rename to compiler/testData/loadJava/ClassDoesNotOverrideMethod.kt
diff --git a/compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.txt
rename to compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.java b/compiler/testData/loadJava/ClassWithTypeP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypeP.java
rename to compiler/testData/loadJava/ClassWithTypeP.java
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt b/compiler/testData/loadJava/ClassWithTypeP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt
rename to compiler/testData/loadJava/ClassWithTypeP.kt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt b/compiler/testData/loadJava/ClassWithTypeP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypeP.txt
rename to compiler/testData/loadJava/ClassWithTypeP.txt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java b/compiler/testData/loadJava/ClassWithTypePExtendsIterableP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java
rename to compiler/testData/loadJava/ClassWithTypePExtendsIterableP.java
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt b/compiler/testData/loadJava/ClassWithTypePExtendsIterableP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt
rename to compiler/testData/loadJava/ClassWithTypePExtendsIterableP.kt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt b/compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.txt
rename to compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.java b/compiler/testData/loadJava/ClassWithTypePP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePP.java
rename to compiler/testData/loadJava/ClassWithTypePP.java
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt b/compiler/testData/loadJava/ClassWithTypePP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt
rename to compiler/testData/loadJava/ClassWithTypePP.kt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt b/compiler/testData/loadJava/ClassWithTypePP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePP.txt
rename to compiler/testData/loadJava/ClassWithTypePP.txt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java b/compiler/testData/loadJava/ClassWithTypePRefNext.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java
rename to compiler/testData/loadJava/ClassWithTypePRefNext.java
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt b/compiler/testData/loadJava/ClassWithTypePRefNext.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt
rename to compiler/testData/loadJava/ClassWithTypePRefNext.kt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/ClassWithTypePRefNext.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.txt
rename to compiler/testData/loadJava/ClassWithTypePRefNext.txt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java b/compiler/testData/loadJava/ClassWithTypePRefSelf.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java
rename to compiler/testData/loadJava/ClassWithTypePRefSelf.java
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt b/compiler/testData/loadJava/ClassWithTypePRefSelf.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt
rename to compiler/testData/loadJava/ClassWithTypePRefSelf.kt
diff --git a/compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt b/compiler/testData/loadJava/ClassWithTypePRefSelf.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.txt
rename to compiler/testData/loadJava/ClassWithTypePRefSelf.txt
diff --git a/compiler/testData/readJavaBinaryClass/FieldAsVar.java b/compiler/testData/loadJava/FieldAsVar.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FieldAsVar.java
rename to compiler/testData/loadJava/FieldAsVar.java
diff --git a/compiler/testData/readJavaBinaryClass/FieldAsVar.kt b/compiler/testData/loadJava/FieldAsVar.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FieldAsVar.kt
rename to compiler/testData/loadJava/FieldAsVar.kt
diff --git a/compiler/testData/readJavaBinaryClass/FieldAsVar.txt b/compiler/testData/loadJava/FieldAsVar.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FieldAsVar.txt
rename to compiler/testData/loadJava/FieldAsVar.txt
diff --git a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.java b/compiler/testData/loadJava/FieldOfArrayType.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FieldOfArrayType.java
rename to compiler/testData/loadJava/FieldOfArrayType.java
diff --git a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt b/compiler/testData/loadJava/FieldOfArrayType.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt
rename to compiler/testData/loadJava/FieldOfArrayType.kt
diff --git a/compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt b/compiler/testData/loadJava/FieldOfArrayType.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FieldOfArrayType.txt
rename to compiler/testData/loadJava/FieldOfArrayType.txt
diff --git a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java b/compiler/testData/loadJava/FinalFieldAsVal.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java
rename to compiler/testData/loadJava/FinalFieldAsVal.java
diff --git a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt b/compiler/testData/loadJava/FinalFieldAsVal.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt
rename to compiler/testData/loadJava/FinalFieldAsVal.kt
diff --git a/compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt b/compiler/testData/loadJava/FinalFieldAsVal.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/FinalFieldAsVal.txt
rename to compiler/testData/loadJava/FinalFieldAsVal.txt
diff --git a/compiler/testData/readJavaBinaryClass/InnerClass.java b/compiler/testData/loadJava/InnerClass.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClass.java
rename to compiler/testData/loadJava/InnerClass.java
diff --git a/compiler/testData/readJavaBinaryClass/InnerClass.kt b/compiler/testData/loadJava/InnerClass.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClass.kt
rename to compiler/testData/loadJava/InnerClass.kt
diff --git a/compiler/testData/readJavaBinaryClass/InnerClass.txt b/compiler/testData/loadJava/InnerClass.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClass.txt
rename to compiler/testData/loadJava/InnerClass.txt
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java b/compiler/testData/loadJava/InnerClassReferencesOuterTP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java
rename to compiler/testData/loadJava/InnerClassReferencesOuterTP.java
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt b/compiler/testData/loadJava/InnerClassReferencesOuterTP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt
rename to compiler/testData/loadJava/InnerClassReferencesOuterTP.kt
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt b/compiler/testData/loadJava/InnerClassReferencesOuterTP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.txt
rename to compiler/testData/loadJava/InnerClassReferencesOuterTP.txt
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java b/compiler/testData/loadJava/InnerClassesInGeneric.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java
rename to compiler/testData/loadJava/InnerClassesInGeneric.java
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt b/compiler/testData/loadJava/InnerClassesInGeneric.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt
rename to compiler/testData/loadJava/InnerClassesInGeneric.kt
diff --git a/compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt b/compiler/testData/loadJava/InnerClassesInGeneric.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.txt
rename to compiler/testData/loadJava/InnerClassesInGeneric.txt
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java b/compiler/testData/loadJava/MethodReferencesOuterClassTP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java
rename to compiler/testData/loadJava/MethodReferencesOuterClassTP.java
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt b/compiler/testData/loadJava/MethodReferencesOuterClassTP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt
rename to compiler/testData/loadJava/MethodReferencesOuterClassTP.kt
diff --git a/compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt b/compiler/testData/loadJava/MethodReferencesOuterClassTP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.txt
rename to compiler/testData/loadJava/MethodReferencesOuterClassTP.txt
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java b/compiler/testData/loadJava/MethodTypePOneUpperBound.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java
rename to compiler/testData/loadJava/MethodTypePOneUpperBound.java
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt b/compiler/testData/loadJava/MethodTypePOneUpperBound.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt
rename to compiler/testData/loadJava/MethodTypePOneUpperBound.kt
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.txt b/compiler/testData/loadJava/MethodTypePOneUpperBound.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.txt
rename to compiler/testData/loadJava/MethodTypePOneUpperBound.txt
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java b/compiler/testData/loadJava/MethodTypePTwoUpperBounds.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java
rename to compiler/testData/loadJava/MethodTypePTwoUpperBounds.java
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt b/compiler/testData/loadJava/MethodTypePTwoUpperBounds.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt
rename to compiler/testData/loadJava/MethodTypePTwoUpperBounds.kt
diff --git a/compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.txt b/compiler/testData/loadJava/MethodTypePTwoUpperBounds.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.txt
rename to compiler/testData/loadJava/MethodTypePTwoUpperBounds.txt
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.java b/compiler/testData/loadJava/MethodWithTypeP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypeP.java
rename to compiler/testData/loadJava/MethodWithTypeP.java
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt b/compiler/testData/loadJava/MethodWithTypeP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt
rename to compiler/testData/loadJava/MethodWithTypeP.kt
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt b/compiler/testData/loadJava/MethodWithTypeP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypeP.txt
rename to compiler/testData/loadJava/MethodWithTypeP.txt
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.java b/compiler/testData/loadJava/MethodWithTypePP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypePP.java
rename to compiler/testData/loadJava/MethodWithTypePP.java
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt b/compiler/testData/loadJava/MethodWithTypePP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt
rename to compiler/testData/loadJava/MethodWithTypePP.kt
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt b/compiler/testData/loadJava/MethodWithTypePP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypePP.txt
rename to compiler/testData/loadJava/MethodWithTypePP.txt
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java b/compiler/testData/loadJava/MethodWithTypePRefClassP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java
rename to compiler/testData/loadJava/MethodWithTypePRefClassP.java
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt b/compiler/testData/loadJava/MethodWithTypePRefClassP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt
rename to compiler/testData/loadJava/MethodWithTypePRefClassP.kt
diff --git a/compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt b/compiler/testData/loadJava/MethodWithTypePRefClassP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.txt
rename to compiler/testData/loadJava/MethodWithTypePRefClassP.txt
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java b/compiler/testData/loadJava/MethosWithPRefTP.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java
rename to compiler/testData/loadJava/MethosWithPRefTP.java
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt b/compiler/testData/loadJava/MethosWithPRefTP.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt
rename to compiler/testData/loadJava/MethosWithPRefTP.kt
diff --git a/compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt b/compiler/testData/loadJava/MethosWithPRefTP.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MethosWithPRefTP.txt
rename to compiler/testData/loadJava/MethosWithPRefTP.txt
diff --git a/compiler/testData/readJavaBinaryClass/MyException.java b/compiler/testData/loadJava/MyException.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MyException.java
rename to compiler/testData/loadJava/MyException.java
diff --git a/compiler/testData/readJavaBinaryClass/MyException.kt b/compiler/testData/loadJava/MyException.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MyException.kt
rename to compiler/testData/loadJava/MyException.kt
diff --git a/compiler/testData/readJavaBinaryClass/MyException.txt b/compiler/testData/loadJava/MyException.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/MyException.txt
rename to compiler/testData/loadJava/MyException.txt
diff --git a/compiler/testData/readJavaBinaryClass/Simple.java b/compiler/testData/loadJava/Simple.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/Simple.java
rename to compiler/testData/loadJava/Simple.java
diff --git a/compiler/testData/readJavaBinaryClass/Simple.kt b/compiler/testData/loadJava/Simple.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/Simple.kt
rename to compiler/testData/loadJava/Simple.kt
diff --git a/compiler/testData/readJavaBinaryClass/Simple.txt b/compiler/testData/loadJava/Simple.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/Simple.txt
rename to compiler/testData/loadJava/Simple.txt
diff --git a/compiler/testData/readJavaBinaryClass/TwoFields.java b/compiler/testData/loadJava/TwoFields.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/TwoFields.java
rename to compiler/testData/loadJava/TwoFields.java
diff --git a/compiler/testData/readJavaBinaryClass/TwoFields.kt b/compiler/testData/loadJava/TwoFields.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/TwoFields.kt
rename to compiler/testData/loadJava/TwoFields.kt
diff --git a/compiler/testData/readJavaBinaryClass/TwoFields.txt b/compiler/testData/loadJava/TwoFields.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/TwoFields.txt
rename to compiler/testData/loadJava/TwoFields.txt
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java b/compiler/testData/loadJava/annotation/AnnotatedAnnotation.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java
rename to compiler/testData/loadJava/annotation/AnnotatedAnnotation.java
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.kt b/compiler/testData/loadJava/annotation/AnnotatedAnnotation.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.kt
rename to compiler/testData/loadJava/annotation/AnnotatedAnnotation.kt
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.txt b/compiler/testData/loadJava/annotation/AnnotatedAnnotation.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.txt
rename to compiler/testData/loadJava/annotation/AnnotatedAnnotation.txt
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java b/compiler/testData/loadJava/annotation/AnnotatedMethod.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java
rename to compiler/testData/loadJava/annotation/AnnotatedMethod.java
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt b/compiler/testData/loadJava/annotation/AnnotatedMethod.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt
rename to compiler/testData/loadJava/annotation/AnnotatedMethod.kt
diff --git a/compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt b/compiler/testData/loadJava/annotation/AnnotatedMethod.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.txt
rename to compiler/testData/loadJava/annotation/AnnotatedMethod.txt
diff --git a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java b/compiler/testData/loadJava/annotation/SimpleAnnotation.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java
rename to compiler/testData/loadJava/annotation/SimpleAnnotation.java
diff --git a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.kt b/compiler/testData/loadJava/annotation/SimpleAnnotation.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.kt
rename to compiler/testData/loadJava/annotation/SimpleAnnotation.kt
diff --git a/compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.txt b/compiler/testData/loadJava/annotation/SimpleAnnotation.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.txt
rename to compiler/testData/loadJava/annotation/SimpleAnnotation.txt
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java b/compiler/testData/loadJava/constructor/ConstructorGenericDeep.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java
rename to compiler/testData/loadJava/constructor/ConstructorGenericDeep.java
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt b/compiler/testData/loadJava/constructor/ConstructorGenericDeep.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt
rename to compiler/testData/loadJava/constructor/ConstructorGenericDeep.kt
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt b/compiler/testData/loadJava/constructor/ConstructorGenericDeep.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt
rename to compiler/testData/loadJava/constructor/ConstructorGenericDeep.txt
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java b/compiler/testData/loadJava/constructor/ConstructorGenericSimple.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java
rename to compiler/testData/loadJava/constructor/ConstructorGenericSimple.java
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt b/compiler/testData/loadJava/constructor/ConstructorGenericSimple.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt
rename to compiler/testData/loadJava/constructor/ConstructorGenericSimple.kt
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt b/compiler/testData/loadJava/constructor/ConstructorGenericSimple.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt
rename to compiler/testData/loadJava/constructor/ConstructorGenericSimple.txt
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java b/compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java
rename to compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.java
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt b/compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt
rename to compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.kt
diff --git a/compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt b/compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt
rename to compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.txt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java b/compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java
rename to compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.java
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt b/compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt
rename to compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.kt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.txt
rename to compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.txt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java b/compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java
rename to compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.java
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt b/compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt
rename to compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.kt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt b/compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.txt
rename to compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.txt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java b/compiler/testData/loadJava/javaBean/JavaBeanVal.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java
rename to compiler/testData/loadJava/javaBean/JavaBeanVal.java
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt b/compiler/testData/loadJava/javaBean/JavaBeanVal.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt
rename to compiler/testData/loadJava/javaBean/JavaBeanVal.kt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt b/compiler/testData/loadJava/javaBean/JavaBeanVal.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.txt
rename to compiler/testData/loadJava/javaBean/JavaBeanVal.txt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java b/compiler/testData/loadJava/javaBean/JavaBeanVar.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java
rename to compiler/testData/loadJava/javaBean/JavaBeanVar.java
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt b/compiler/testData/loadJava/javaBean/JavaBeanVar.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt
rename to compiler/testData/loadJava/javaBean/JavaBeanVar.kt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt b/compiler/testData/loadJava/javaBean/JavaBeanVar.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.txt
rename to compiler/testData/loadJava/javaBean/JavaBeanVar.txt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java b/compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java
rename to compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.java
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt b/compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt
rename to compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.kt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.txt
rename to compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.txt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java b/compiler/testData/loadJava/javaBean/TwoSetters.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java
rename to compiler/testData/loadJava/javaBean/TwoSetters.java
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt b/compiler/testData/loadJava/javaBean/TwoSetters.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt
rename to compiler/testData/loadJava/javaBean/TwoSetters.kt
diff --git a/compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt b/compiler/testData/loadJava/javaBean/TwoSetters.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.txt
rename to compiler/testData/loadJava/javaBean/TwoSetters.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.java b/compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.java
rename to compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.kt b/compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.kt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.txt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.java b/compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.java
rename to compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt b/compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.txt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.java b/compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.java
rename to compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.kt b/compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.kt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.txt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.java b/compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.java
rename to compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.kt b/compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.kt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.txt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.java b/compiler/testData/loadJava/kotlinSignature/MethodWithVararg.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.java
rename to compiler/testData/loadJava/kotlinSignature/MethodWithVararg.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.kt b/compiler/testData/loadJava/kotlinSignature/MethodWithVararg.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.kt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithVararg.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/kotlinSignature/MethodWithVararg.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.txt
rename to compiler/testData/loadJava/kotlinSignature/MethodWithVararg.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.java b/compiler/testData/loadJava/kotlinSignature/error/AddingNullability.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.java
rename to compiler/testData/loadJava/kotlinSignature/error/AddingNullability.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.kt b/compiler/testData/loadJava/kotlinSignature/error/AddingNullability.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.kt
rename to compiler/testData/loadJava/kotlinSignature/error/AddingNullability.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.txt b/compiler/testData/loadJava/kotlinSignature/error/AddingNullability.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.txt
rename to compiler/testData/loadJava/kotlinSignature/error/AddingNullability.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.java b/compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.java
rename to compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.kt b/compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.kt
rename to compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.txt b/compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.txt
rename to compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.java b/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.java
rename to compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.kt b/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.kt
rename to compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.txt
rename to compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.java b/compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.java
rename to compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.kt b/compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.kt
rename to compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.txt
rename to compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.java b/compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.java
rename to compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.kt b/compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.kt
rename to compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.txt
rename to compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.java b/compiler/testData/loadJava/kotlinSignature/error/SyntaxError.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.java
rename to compiler/testData/loadJava/kotlinSignature/error/SyntaxError.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.kt b/compiler/testData/loadJava/kotlinSignature/error/SyntaxError.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.kt
rename to compiler/testData/loadJava/kotlinSignature/error/SyntaxError.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.txt b/compiler/testData/loadJava/kotlinSignature/error/SyntaxError.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.txt
rename to compiler/testData/loadJava/kotlinSignature/error/SyntaxError.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.java b/compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.java
rename to compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.kt b/compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.kt
rename to compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.txt
rename to compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.java b/compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.java b/compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.java b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.java b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.java b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.java b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.java b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.java b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.java b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.java b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.java b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.java b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.java
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.java
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.kt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.kt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.kt
diff --git a/compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.txt
rename to compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.txt
diff --git a/compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.java b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.java
rename to compiler/testData/loadJava/modality/ModalityOfFakeOverrides.java
diff --git a/compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.kt b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.kt
rename to compiler/testData/loadJava/modality/ModalityOfFakeOverrides.kt
diff --git a/compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.txt
rename to compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.java b/compiler/testData/loadJava/notNull/NotNullField.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullField.java
rename to compiler/testData/loadJava/notNull/NotNullField.java
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt b/compiler/testData/loadJava/notNull/NotNullField.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt
rename to compiler/testData/loadJava/notNull/NotNullField.kt
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt b/compiler/testData/loadJava/notNull/NotNullField.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullField.txt
rename to compiler/testData/loadJava/notNull/NotNullField.txt
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java b/compiler/testData/loadJava/notNull/NotNullMethod.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java
rename to compiler/testData/loadJava/notNull/NotNullMethod.java
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt b/compiler/testData/loadJava/notNull/NotNullMethod.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt
rename to compiler/testData/loadJava/notNull/NotNullMethod.kt
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt b/compiler/testData/loadJava/notNull/NotNullMethod.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.txt
rename to compiler/testData/loadJava/notNull/NotNullMethod.txt
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java b/compiler/testData/loadJava/notNull/NotNullParameter.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java
rename to compiler/testData/loadJava/notNull/NotNullParameter.java
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt b/compiler/testData/loadJava/notNull/NotNullParameter.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt
rename to compiler/testData/loadJava/notNull/NotNullParameter.kt
diff --git a/compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt b/compiler/testData/loadJava/notNull/NotNullParameter.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.txt
rename to compiler/testData/loadJava/notNull/NotNullParameter.txt
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.java b/compiler/testData/loadJava/vararg/VarargInt.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/vararg/VarargInt.java
rename to compiler/testData/loadJava/vararg/VarargInt.java
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.kt b/compiler/testData/loadJava/vararg/VarargInt.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/vararg/VarargInt.kt
rename to compiler/testData/loadJava/vararg/VarargInt.kt
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt b/compiler/testData/loadJava/vararg/VarargInt.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/vararg/VarargInt.txt
rename to compiler/testData/loadJava/vararg/VarargInt.txt
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargString.java b/compiler/testData/loadJava/vararg/VarargString.java
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/vararg/VarargString.java
rename to compiler/testData/loadJava/vararg/VarargString.java
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargString.kt b/compiler/testData/loadJava/vararg/VarargString.kt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/vararg/VarargString.kt
rename to compiler/testData/loadJava/vararg/VarargString.kt
diff --git a/compiler/testData/readJavaBinaryClass/vararg/VarargString.txt b/compiler/testData/loadJava/vararg/VarargString.txt
similarity index 100%
rename from compiler/testData/readJavaBinaryClass/vararg/VarargString.txt
rename to compiler/testData/loadJava/vararg/VarargString.txt
diff --git a/compiler/testData/loadJavaDescriptors/enum/expected.txt b/compiler/testData/loadJavaCustom/enum/expected.txt
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/enum/expected.txt
rename to compiler/testData/loadJavaCustom/enum/expected.txt
diff --git a/compiler/testData/loadJavaDescriptors/enum/java/MyEnum.java b/compiler/testData/loadJavaCustom/enum/java/MyEnum.java
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/enum/java/MyEnum.java
rename to compiler/testData/loadJavaCustom/enum/java/MyEnum.java
diff --git a/compiler/testData/loadJavaDescriptors/inner.java b/compiler/testData/loadJavaCustom/inner.java
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/inner.java
rename to compiler/testData/loadJavaCustom/inner.java
diff --git a/compiler/testData/loadJavaDescriptors/inner.txt b/compiler/testData/loadJavaCustom/inner.txt
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/inner.txt
rename to compiler/testData/loadJavaCustom/inner.txt
diff --git a/compiler/testData/loadJavaDescriptors/packageLocalVisibility/expected.txt b/compiler/testData/loadJavaCustom/packageLocalVisibility/expected.txt
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/packageLocalVisibility/expected.txt
rename to compiler/testData/loadJavaCustom/packageLocalVisibility/expected.txt
diff --git a/compiler/testData/loadJavaDescriptors/packageLocalVisibility/java/awt/Frame.java b/compiler/testData/loadJavaCustom/packageLocalVisibility/java/awt/Frame.java
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/packageLocalVisibility/java/awt/Frame.java
rename to compiler/testData/loadJavaCustom/packageLocalVisibility/java/awt/Frame.java
diff --git a/compiler/testData/loadJavaDescriptors/packageLocalVisibility/java/test/JFrame.java b/compiler/testData/loadJavaCustom/packageLocalVisibility/java/test/JFrame.java
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/packageLocalVisibility/java/test/JFrame.java
rename to compiler/testData/loadJavaCustom/packageLocalVisibility/java/test/JFrame.java
diff --git a/compiler/testData/loadJavaDescriptors/staticFinal/expected.txt b/compiler/testData/loadJavaCustom/staticFinal/expected.txt
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/staticFinal/expected.txt
rename to compiler/testData/loadJavaCustom/staticFinal/expected.txt
diff --git a/compiler/testData/loadJavaDescriptors/staticFinal/test.java b/compiler/testData/loadJavaCustom/staticFinal/test.java
similarity index 100%
rename from compiler/testData/loadJavaDescriptors/staticFinal/test.java
rename to compiler/testData/loadJavaCustom/staticFinal/test.java
diff --git a/compiler/testData/readKotlinBinaryClass/class/Class.kt b/compiler/testData/loadKotlin/class/Class.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/Class.kt
rename to compiler/testData/loadKotlin/class/Class.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/Class.txt b/compiler/testData/loadKotlin/class/Class.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/Class.txt
rename to compiler/testData/loadKotlin/class/Class.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.kt b/compiler/testData/loadKotlin/class/ClassInParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassInParam.kt
rename to compiler/testData/loadKotlin/class/ClassInParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt b/compiler/testData/loadKotlin/class/ClassInParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassInParam.txt
rename to compiler/testData/loadKotlin/class/ClassInParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.kt b/compiler/testData/loadKotlin/class/ClassInnerClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.kt
rename to compiler/testData/loadKotlin/class/ClassInnerClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt b/compiler/testData/loadKotlin/class/ClassInnerClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt
rename to compiler/testData/loadKotlin/class/ClassInnerClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.kt b/compiler/testData/loadKotlin/class/ClassOutParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassOutParam.kt
rename to compiler/testData/loadKotlin/class/ClassOutParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt b/compiler/testData/loadKotlin/class/ClassOutParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassOutParam.txt
rename to compiler/testData/loadKotlin/class/ClassOutParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParam.kt b/compiler/testData/loadKotlin/class/ClassParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParam.kt
rename to compiler/testData/loadKotlin/class/ClassParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParam.txt b/compiler/testData/loadKotlin/class/ClassParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParam.txt
rename to compiler/testData/loadKotlin/class/ClassParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.kt b/compiler/testData/loadKotlin/class/ClassParamReferencesParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.kt
rename to compiler/testData/loadKotlin/class/ClassParamReferencesParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt b/compiler/testData/loadKotlin/class/ClassParamReferencesParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.txt
rename to compiler/testData/loadKotlin/class/ClassParamReferencesParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.kt b/compiler/testData/loadKotlin/class/ClassParamReferencesParam2.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.kt
rename to compiler/testData/loadKotlin/class/ClassParamReferencesParam2.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt b/compiler/testData/loadKotlin/class/ClassParamReferencesParam2.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.txt
rename to compiler/testData/loadKotlin/class/ClassParamReferencesParam2.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.kt b/compiler/testData/loadKotlin/class/ClassParamReferencesSelf.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.kt
rename to compiler/testData/loadKotlin/class/ClassParamReferencesSelf.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt b/compiler/testData/loadKotlin/class/ClassParamReferencesSelf.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.txt
rename to compiler/testData/loadKotlin/class/ClassParamReferencesSelf.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.kt b/compiler/testData/loadKotlin/class/ClassParamUpperClassBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.kt
rename to compiler/testData/loadKotlin/class/ClassParamUpperClassBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperClassBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.txt
rename to compiler/testData/loadKotlin/class/ClassParamUpperClassBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt b/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt
rename to compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.txt
rename to compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt
rename to compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.txt
rename to compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt
rename to compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt b/compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.txt
rename to compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.kt b/compiler/testData/loadKotlin/class/ClassTwoParams.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.kt
rename to compiler/testData/loadKotlin/class/ClassTwoParams.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt b/compiler/testData/loadKotlin/class/ClassTwoParams.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.txt
rename to compiler/testData/loadKotlin/class/ClassTwoParams.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.kt b/compiler/testData/loadKotlin/class/ClassTwoParams2.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.kt
rename to compiler/testData/loadKotlin/class/ClassTwoParams2.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt b/compiler/testData/loadKotlin/class/ClassTwoParams2.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.txt
rename to compiler/testData/loadKotlin/class/ClassTwoParams2.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.kt b/compiler/testData/loadKotlin/class/InheritClassSimple.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.kt
rename to compiler/testData/loadKotlin/class/InheritClassSimple.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt b/compiler/testData/loadKotlin/class/InheritClassSimple.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.txt
rename to compiler/testData/loadKotlin/class/InheritClassSimple.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.kt b/compiler/testData/loadKotlin/class/InheritClassWithParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.kt
rename to compiler/testData/loadKotlin/class/InheritClassWithParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt b/compiler/testData/loadKotlin/class/InheritClassWithParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.txt
rename to compiler/testData/loadKotlin/class/InheritClassWithParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.kt b/compiler/testData/loadKotlin/class/InheritTraitWithParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.kt
rename to compiler/testData/loadKotlin/class/InheritTraitWithParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt b/compiler/testData/loadKotlin/class/InheritTraitWithParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.txt
rename to compiler/testData/loadKotlin/class/InheritTraitWithParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InnerClass.kt b/compiler/testData/loadKotlin/class/InnerClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InnerClass.kt
rename to compiler/testData/loadKotlin/class/InnerClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InnerClass.txt b/compiler/testData/loadKotlin/class/InnerClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InnerClass.txt
rename to compiler/testData/loadKotlin/class/InnerClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.kt b/compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.kt
rename to compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.txt b/compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.txt
rename to compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/class/Trait.kt b/compiler/testData/loadKotlin/class/Trait.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/Trait.kt
rename to compiler/testData/loadKotlin/class/Trait.kt
diff --git a/compiler/testData/readKotlinBinaryClass/class/Trait.txt b/compiler/testData/loadKotlin/class/Trait.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/class/Trait.txt
rename to compiler/testData/loadKotlin/class/Trait.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.kt b/compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.kt
rename to compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt b/compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
rename to compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.kt b/compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.kt
rename to compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt b/compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
rename to compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.kt b/compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.kt
rename to compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.txt b/compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.txt
rename to compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.kt b/compiler/testData/loadKotlin/classFun/FunInParamSuper.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.kt
rename to compiler/testData/loadKotlin/classFun/FunInParamSuper.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt b/compiler/testData/loadKotlin/classFun/FunInParamSuper.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
rename to compiler/testData/loadKotlin/classFun/FunInParamSuper.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.kt b/compiler/testData/loadKotlin/classFun/TraitFinalFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.kt
rename to compiler/testData/loadKotlin/classFun/TraitFinalFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.txt b/compiler/testData/loadKotlin/classFun/TraitFinalFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.txt
rename to compiler/testData/loadKotlin/classFun/TraitFinalFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.kt b/compiler/testData/loadKotlin/classFun/TraitOpenFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.kt
rename to compiler/testData/loadKotlin/classFun/TraitOpenFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.txt b/compiler/testData/loadKotlin/classFun/TraitOpenFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.txt
rename to compiler/testData/loadKotlin/classFun/TraitOpenFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.kt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.kt
rename to compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.txt
rename to compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.kt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.kt
rename to compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt b/compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.txt
rename to compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.kt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.kt
rename to compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.txt
rename to compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.kt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.kt
rename to compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.txt
rename to compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.kt b/compiler/testData/loadKotlin/classObject/SimpleClassObject.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.kt
rename to compiler/testData/loadKotlin/classObject/SimpleClassObject.kt
diff --git a/compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt b/compiler/testData/loadKotlin/classObject/SimpleClassObject.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.txt
rename to compiler/testData/loadKotlin/classObject/SimpleClassObject.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.kt b/compiler/testData/loadKotlin/constructor/Constructor0.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/Constructor0.kt
rename to compiler/testData/loadKotlin/constructor/Constructor0.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt b/compiler/testData/loadKotlin/constructor/Constructor0.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/Constructor0.txt
rename to compiler/testData/loadKotlin/constructor/Constructor0.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.kt b/compiler/testData/loadKotlin/constructor/Constructor1.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/Constructor1.kt
rename to compiler/testData/loadKotlin/constructor/Constructor1.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt b/compiler/testData/loadKotlin/constructor/Constructor1.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/Constructor1.txt
rename to compiler/testData/loadKotlin/constructor/Constructor1.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.kt b/compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.kt
rename to compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.txt b/compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.txt
rename to compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.kt b/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.kt
rename to compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.txt
rename to compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.kt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.kt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.txt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.kt b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.kt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.txt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.txt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt
diff --git a/compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
rename to compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunInParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunInParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunInParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunInParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunOutParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunOutParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunOutParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunOutParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam2.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam2.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam2.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams2.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams2.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
rename to compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams2.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.txt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
rename to compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.kt b/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt b/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.kt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.kt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.kt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/NsFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.kt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.kt
diff --git a/compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.txt
rename to compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVal.kt b/compiler/testData/loadKotlin/prop/ClassVal.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ClassVal.kt
rename to compiler/testData/loadKotlin/prop/ClassVal.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt b/compiler/testData/loadKotlin/prop/ClassVal.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt
rename to compiler/testData/loadKotlin/prop/ClassVal.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.kt b/compiler/testData/loadKotlin/prop/ClassValAbstract.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.kt
rename to compiler/testData/loadKotlin/prop/ClassValAbstract.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt b/compiler/testData/loadKotlin/prop/ClassValAbstract.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt
rename to compiler/testData/loadKotlin/prop/ClassValAbstract.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVar.kt b/compiler/testData/loadKotlin/prop/ClassVar.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ClassVar.kt
rename to compiler/testData/loadKotlin/prop/ClassVar.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt b/compiler/testData/loadKotlin/prop/ClassVar.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt
rename to compiler/testData/loadKotlin/prop/ClassVar.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.kt b/compiler/testData/loadKotlin/prop/CollectionSize.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/CollectionSize.kt
rename to compiler/testData/loadKotlin/prop/CollectionSize.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt b/compiler/testData/loadKotlin/prop/CollectionSize.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/CollectionSize.txt
rename to compiler/testData/loadKotlin/prop/CollectionSize.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.kt b/compiler/testData/loadKotlin/prop/ExtValClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValClass.kt
rename to compiler/testData/loadKotlin/prop/ExtValClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt b/compiler/testData/loadKotlin/prop/ExtValClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValClass.txt
rename to compiler/testData/loadKotlin/prop/ExtValClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.kt b/compiler/testData/loadKotlin/prop/ExtValInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtValInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt b/compiler/testData/loadKotlin/prop/ExtValInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtValInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.kt b/compiler/testData/loadKotlin/prop/ExtValInt.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValInt.kt
rename to compiler/testData/loadKotlin/prop/ExtValInt.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt b/compiler/testData/loadKotlin/prop/ExtValInt.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValInt.txt
rename to compiler/testData/loadKotlin/prop/ExtValInt.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.kt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.kt
rename to compiler/testData/loadKotlin/prop/ExtValIntCharSequence.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.txt
rename to compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.kt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.kt
rename to compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.txt
rename to compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.kt b/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.kt b/compiler/testData/loadKotlin/prop/ExtValIntTInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtValIntTInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtValIntTInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.kt b/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtValIntTQInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt b/compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtValIntTQInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.kt b/compiler/testData/loadKotlin/prop/ExtValTIntInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtValTIntInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtValTIntInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.kt b/compiler/testData/loadKotlin/prop/ExtVarClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.kt
rename to compiler/testData/loadKotlin/prop/ExtVarClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.txt
rename to compiler/testData/loadKotlin/prop/ExtVarClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.kt b/compiler/testData/loadKotlin/prop/ExtVarInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtVarInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtVarInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.kt b/compiler/testData/loadKotlin/prop/ExtVarInt.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.kt
rename to compiler/testData/loadKotlin/prop/ExtVarInt.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.txt
rename to compiler/testData/loadKotlin/prop/ExtVarInt.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.kt b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtVarIntTInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtVarIntTInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.kt b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.kt b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.kt
rename to compiler/testData/loadKotlin/prop/ExtVarMapPQInt.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.txt
rename to compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.kt b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtVarTIntInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtVarTIntInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.kt b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.kt
rename to compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt b/compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
rename to compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.kt b/compiler/testData/loadKotlin/prop/ExtVarl.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarl.kt
rename to compiler/testData/loadKotlin/prop/ExtVarl.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt b/compiler/testData/loadKotlin/prop/ExtVarl.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt
rename to compiler/testData/loadKotlin/prop/ExtVarl.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVal.kt b/compiler/testData/loadKotlin/prop/NsVal.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/NsVal.kt
rename to compiler/testData/loadKotlin/prop/NsVal.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVal.txt b/compiler/testData/loadKotlin/prop/NsVal.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/NsVal.txt
rename to compiler/testData/loadKotlin/prop/NsVal.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVar.kt b/compiler/testData/loadKotlin/prop/NsVar.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/NsVar.kt
rename to compiler/testData/loadKotlin/prop/NsVar.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/NsVar.txt b/compiler/testData/loadKotlin/prop/NsVar.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/NsVar.txt
rename to compiler/testData/loadKotlin/prop/NsVar.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.kt b/compiler/testData/loadKotlin/prop/OverrideClassVal.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.kt
rename to compiler/testData/loadKotlin/prop/OverrideClassVal.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt b/compiler/testData/loadKotlin/prop/OverrideClassVal.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
rename to compiler/testData/loadKotlin/prop/OverrideClassVal.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.kt b/compiler/testData/loadKotlin/prop/OverrideTraitVal.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.kt
rename to compiler/testData/loadKotlin/prop/OverrideTraitVal.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt b/compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
rename to compiler/testData/loadKotlin/prop/OverrideTraitVal.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.kt b/compiler/testData/loadKotlin/prop/PropFromSuperclass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.kt
rename to compiler/testData/loadKotlin/prop/PropFromSuperclass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt b/compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
rename to compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.kt b/compiler/testData/loadKotlin/prop/TraitFinalVar.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.kt
rename to compiler/testData/loadKotlin/prop/TraitFinalVar.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.txt b/compiler/testData/loadKotlin/prop/TraitFinalVar.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.txt
rename to compiler/testData/loadKotlin/prop/TraitFinalVar.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.kt b/compiler/testData/loadKotlin/prop/TraitOpenVal.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.kt
rename to compiler/testData/loadKotlin/prop/TraitOpenVal.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.txt b/compiler/testData/loadKotlin/prop/TraitOpenVal.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.txt
rename to compiler/testData/loadKotlin/prop/TraitOpenVal.txt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.kt b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.kt
rename to compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.kt
diff --git a/compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt b/compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
rename to compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Any.kt b/compiler/testData/loadKotlin/type/Any.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Any.kt
rename to compiler/testData/loadKotlin/type/Any.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Any.txt b/compiler/testData/loadKotlin/type/Any.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Any.txt
rename to compiler/testData/loadKotlin/type/Any.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/AnyQ.kt b/compiler/testData/loadKotlin/type/AnyQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/AnyQ.kt
rename to compiler/testData/loadKotlin/type/AnyQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/AnyQ.txt b/compiler/testData/loadKotlin/type/AnyQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/AnyQ.txt
rename to compiler/testData/loadKotlin/type/AnyQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.kt b/compiler/testData/loadKotlin/type/ArrayOfInt.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.kt
rename to compiler/testData/loadKotlin/type/ArrayOfInt.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt b/compiler/testData/loadKotlin/type/ArrayOfInt.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.txt
rename to compiler/testData/loadKotlin/type/ArrayOfInt.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.kt b/compiler/testData/loadKotlin/type/ArrayOfInteger.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.kt
rename to compiler/testData/loadKotlin/type/ArrayOfInteger.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt b/compiler/testData/loadKotlin/type/ArrayOfInteger.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.txt
rename to compiler/testData/loadKotlin/type/ArrayOfInteger.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.kt b/compiler/testData/loadKotlin/type/ArrayOfString.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ArrayOfString.kt
rename to compiler/testData/loadKotlin/type/ArrayOfString.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt b/compiler/testData/loadKotlin/type/ArrayOfString.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ArrayOfString.txt
rename to compiler/testData/loadKotlin/type/ArrayOfString.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Function1IntString.kt b/compiler/testData/loadKotlin/type/Function1IntString.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Function1IntString.kt
rename to compiler/testData/loadKotlin/type/Function1IntString.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt b/compiler/testData/loadKotlin/type/Function1IntString.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Function1IntString.txt
rename to compiler/testData/loadKotlin/type/Function1IntString.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Int.kt b/compiler/testData/loadKotlin/type/Int.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Int.kt
rename to compiler/testData/loadKotlin/type/Int.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Int.txt b/compiler/testData/loadKotlin/type/Int.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Int.txt
rename to compiler/testData/loadKotlin/type/Int.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntArray.kt b/compiler/testData/loadKotlin/type/IntArray.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/IntArray.kt
rename to compiler/testData/loadKotlin/type/IntArray.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntArray.txt b/compiler/testData/loadKotlin/type/IntArray.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/IntArray.txt
rename to compiler/testData/loadKotlin/type/IntArray.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntQ.kt b/compiler/testData/loadKotlin/type/IntQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/IntQ.kt
rename to compiler/testData/loadKotlin/type/IntQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/IntQ.txt b/compiler/testData/loadKotlin/type/IntQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/IntQ.txt
rename to compiler/testData/loadKotlin/type/IntQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAny.kt b/compiler/testData/loadKotlin/type/ListOfAny.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfAny.kt
rename to compiler/testData/loadKotlin/type/ListOfAny.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt b/compiler/testData/loadKotlin/type/ListOfAny.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfAny.txt
rename to compiler/testData/loadKotlin/type/ListOfAny.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.kt b/compiler/testData/loadKotlin/type/ListOfAnyQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.kt
rename to compiler/testData/loadKotlin/type/ListOfAnyQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt b/compiler/testData/loadKotlin/type/ListOfAnyQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.txt
rename to compiler/testData/loadKotlin/type/ListOfAnyQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfStar.kt b/compiler/testData/loadKotlin/type/ListOfStar.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfStar.kt
rename to compiler/testData/loadKotlin/type/ListOfStar.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt b/compiler/testData/loadKotlin/type/ListOfStar.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfStar.txt
rename to compiler/testData/loadKotlin/type/ListOfStar.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfString.kt b/compiler/testData/loadKotlin/type/ListOfString.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfString.kt
rename to compiler/testData/loadKotlin/type/ListOfString.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfString.txt b/compiler/testData/loadKotlin/type/ListOfString.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfString.txt
rename to compiler/testData/loadKotlin/type/ListOfString.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.kt b/compiler/testData/loadKotlin/type/ListOfjlString.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfjlString.kt
rename to compiler/testData/loadKotlin/type/ListOfjlString.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt b/compiler/testData/loadKotlin/type/ListOfjlString.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/ListOfjlString.txt
rename to compiler/testData/loadKotlin/type/ListOfjlString.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Nothing.kt b/compiler/testData/loadKotlin/type/Nothing.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Nothing.kt
rename to compiler/testData/loadKotlin/type/Nothing.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Nothing.txt b/compiler/testData/loadKotlin/type/Nothing.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Nothing.txt
rename to compiler/testData/loadKotlin/type/Nothing.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/NothingQ.kt b/compiler/testData/loadKotlin/type/NothingQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/NothingQ.kt
rename to compiler/testData/loadKotlin/type/NothingQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/NothingQ.txt b/compiler/testData/loadKotlin/type/NothingQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/NothingQ.txt
rename to compiler/testData/loadKotlin/type/NothingQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/String.kt b/compiler/testData/loadKotlin/type/String.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/String.kt
rename to compiler/testData/loadKotlin/type/String.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/String.txt b/compiler/testData/loadKotlin/type/String.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/String.txt
rename to compiler/testData/loadKotlin/type/String.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/StringQ.kt b/compiler/testData/loadKotlin/type/StringQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/StringQ.kt
rename to compiler/testData/loadKotlin/type/StringQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/StringQ.txt b/compiler/testData/loadKotlin/type/StringQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/StringQ.txt
rename to compiler/testData/loadKotlin/type/StringQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Tuple0.kt b/compiler/testData/loadKotlin/type/Tuple0.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Tuple0.kt
rename to compiler/testData/loadKotlin/type/Tuple0.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/Tuple0.txt b/compiler/testData/loadKotlin/type/Tuple0.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/Tuple0.txt
rename to compiler/testData/loadKotlin/type/Tuple0.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlInteger.kt b/compiler/testData/loadKotlin/type/jlInteger.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlInteger.kt
rename to compiler/testData/loadKotlin/type/jlInteger.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlInteger.txt b/compiler/testData/loadKotlin/type/jlInteger.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlInteger.txt
rename to compiler/testData/loadKotlin/type/jlInteger.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.kt b/compiler/testData/loadKotlin/type/jlIntegerQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.kt
rename to compiler/testData/loadKotlin/type/jlIntegerQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt b/compiler/testData/loadKotlin/type/jlIntegerQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.txt
rename to compiler/testData/loadKotlin/type/jlIntegerQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlNumber.kt b/compiler/testData/loadKotlin/type/jlNumber.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlNumber.kt
rename to compiler/testData/loadKotlin/type/jlNumber.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlNumber.txt b/compiler/testData/loadKotlin/type/jlNumber.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlNumber.txt
rename to compiler/testData/loadKotlin/type/jlNumber.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObject.kt b/compiler/testData/loadKotlin/type/jlObject.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlObject.kt
rename to compiler/testData/loadKotlin/type/jlObject.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObject.txt b/compiler/testData/loadKotlin/type/jlObject.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlObject.txt
rename to compiler/testData/loadKotlin/type/jlObject.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.kt b/compiler/testData/loadKotlin/type/jlObjectQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlObjectQ.kt
rename to compiler/testData/loadKotlin/type/jlObjectQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt b/compiler/testData/loadKotlin/type/jlObjectQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlObjectQ.txt
rename to compiler/testData/loadKotlin/type/jlObjectQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlString.kt b/compiler/testData/loadKotlin/type/jlString.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlString.kt
rename to compiler/testData/loadKotlin/type/jlString.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlString.txt b/compiler/testData/loadKotlin/type/jlString.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlString.txt
rename to compiler/testData/loadKotlin/type/jlString.txt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlStringQ.kt b/compiler/testData/loadKotlin/type/jlStringQ.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlStringQ.kt
rename to compiler/testData/loadKotlin/type/jlStringQ.kt
diff --git a/compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt b/compiler/testData/loadKotlin/type/jlStringQ.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/type/jlStringQ.txt
rename to compiler/testData/loadKotlin/type/jlStringQ.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt
rename to compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.txt b/compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.txt
rename to compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt b/compiler/testData/loadKotlin/visibility/InternalClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt
rename to compiler/testData/loadKotlin/visibility/InternalClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalClass.txt b/compiler/testData/loadKotlin/visibility/InternalClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalClass.txt
rename to compiler/testData/loadKotlin/visibility/InternalClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt b/compiler/testData/loadKotlin/visibility/InternalConstructor.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt
rename to compiler/testData/loadKotlin/visibility/InternalConstructor.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.txt b/compiler/testData/loadKotlin/visibility/InternalConstructor.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.txt
rename to compiler/testData/loadKotlin/visibility/InternalConstructor.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt
rename to compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.txt
rename to compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt
rename to compiler/testData/loadKotlin/visibility/InternalTraitMembers.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.txt
rename to compiler/testData/loadKotlin/visibility/InternalTraitMembers.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt
rename to compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.txt b/compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.txt
rename to compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/PrivateClass.kt b/compiler/testData/loadKotlin/visibility/PrivateClass.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/PrivateClass.kt
rename to compiler/testData/loadKotlin/visibility/PrivateClass.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/PrivateClass.txt b/compiler/testData/loadKotlin/visibility/PrivateClass.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/PrivateClass.txt
rename to compiler/testData/loadKotlin/visibility/PrivateClass.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelFun.kt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelFun.kt
rename to compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelFun.txt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelFun.txt
rename to compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelVal.kt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelVal.kt
rename to compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelVal.txt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelVal.txt
rename to compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/TopLevelVarWithPrivateSetter.kt b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.kt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/TopLevelVarWithPrivateSetter.kt
rename to compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.kt
diff --git a/compiler/testData/readKotlinBinaryClass/visibility/TopLevelVarWithPrivateSetter.txt b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
similarity index 100%
rename from compiler/testData/readKotlinBinaryClass/visibility/TopLevelVarWithPrivateSetter.txt
rename to compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
diff --git a/compiler/testData/loadKotlinDescriptors/enum/simpleEnum.kt b/compiler/testData/loadKotlinCustom/enum/simpleEnum.kt
similarity index 100%
rename from compiler/testData/loadKotlinDescriptors/enum/simpleEnum.kt
rename to compiler/testData/loadKotlinCustom/enum/simpleEnum.kt
diff --git a/compiler/testData/loadKotlinDescriptors/enum/simpleEnum.txt b/compiler/testData/loadKotlinCustom/enum/simpleEnum.txt
similarity index 100%
rename from compiler/testData/loadKotlinDescriptors/enum/simpleEnum.txt
rename to compiler/testData/loadKotlinCustom/enum/simpleEnum.txt
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
index ea21dadb259..cab663680b4 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
@@ -61,7 +61,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
                 "LoadJavaTestGenerated",
                 AbstractLoadJavaTest.class,
                 Arrays.asList(
-                        new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"), true, extension, "doTest")
+                        new SimpleTestClassModel(new File("compiler/testData/loadJava"), true, extension, "doTest")
                 ),
                 AbstractLoadJavaTest.class
         ).generateAndSave();
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java
index b74a10289cf..8cf000a7a30 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java
@@ -35,7 +35,7 @@ import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaces;
  */
 public final class LoadCompiledKotlinCustomTest extends TestCaseWithTmpdir {
     @NotNull
-    private static final String PATH = "compiler/testData/loadKotlinDescriptors";
+    private static final String PATH = "compiler/testData/loadKotlinCustom";
 
     private void doTest(@NotNull String expectedFileName, @NotNull String kotlinFileName) throws Exception {
         NamespaceDescriptor namespaceFromClass =
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java
index 2b99c19ffd6..78739a14171 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java
@@ -65,7 +65,7 @@ public final class LoadCompiledKotlinTest extends TestCaseWithTmpdir {
     }
 
     public static Test suite() {
-        return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/readKotlinBinaryClass", true, new JetTestCaseBuilder.NamedTestFactory() {
+        return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/loadKotlin", true, new JetTestCaseBuilder.NamedTestFactory() {
             @NotNull
             @Override
             public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) {
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
index 8a4e8af8aaa..2c98ecac663 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java
@@ -40,7 +40,7 @@ import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileJavaAndEx
  */
 public final class LoadJavaCustomTest extends KotlinTestWithEnvironment {
     @NotNull
-    private static final String PATH = "compiler/testData/loadJavaDescriptors";
+    private static final String PATH = "compiler/testData/loadJavaCustom";
 
     @Override
     protected JetCoreEnvironment createEnvironment() {
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index 03d4a5e0e4e..f01eb4fddad 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jetbrains.jet.jvm.compiler;
 
 import junit.framework.Test;
@@ -24,341 +23,341 @@ import org.jetbrains.jet.test.TestMetadata;
 import java.io.File;
 
 /** This class is generated by {@link org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest}. DO NOT MODIFY MANUALLY */
-@TestMetadata("compiler/testData/readJavaBinaryClass")
+@TestMetadata("compiler/testData/loadJava")
 public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
-    public void testAllFilesPresentInReadJavaBinaryClass() throws Exception {
-        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass"), "java", false);
+    public void testAllFilesPresentInLoadJava() throws Exception {
+        JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava"), "java", false);
     }
     
     @TestMetadata("ArrayTypeVariance.java")
     public void testArrayTypeVariance() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/ArrayTypeVariance.java");
+        doTest("compiler/testData/loadJava/ArrayTypeVariance.java");
     }
     
     @TestMetadata("ClassDoesNotOverrideMethod.java")
     public void testClassDoesNotOverrideMethod() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java");
+        doTest("compiler/testData/loadJava/ClassDoesNotOverrideMethod.java");
     }
     
     @TestMetadata("ClassWithTypeP.java")
     public void testClassWithTypeP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/ClassWithTypeP.java");
+        doTest("compiler/testData/loadJava/ClassWithTypeP.java");
     }
     
     @TestMetadata("ClassWithTypePExtendsIterableP.java")
     public void testClassWithTypePExtendsIterableP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java");
+        doTest("compiler/testData/loadJava/ClassWithTypePExtendsIterableP.java");
     }
     
     @TestMetadata("ClassWithTypePP.java")
     public void testClassWithTypePP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePP.java");
+        doTest("compiler/testData/loadJava/ClassWithTypePP.java");
     }
     
     @TestMetadata("ClassWithTypePRefNext.java")
     public void testClassWithTypePRefNext() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java");
+        doTest("compiler/testData/loadJava/ClassWithTypePRefNext.java");
     }
     
     @TestMetadata("ClassWithTypePRefSelf.java")
     public void testClassWithTypePRefSelf() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java");
+        doTest("compiler/testData/loadJava/ClassWithTypePRefSelf.java");
     }
     
     @TestMetadata("FieldAsVar.java")
     public void testFieldAsVar() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/FieldAsVar.java");
+        doTest("compiler/testData/loadJava/FieldAsVar.java");
     }
     
     @TestMetadata("FieldOfArrayType.java")
     public void testFieldOfArrayType() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/FieldOfArrayType.java");
+        doTest("compiler/testData/loadJava/FieldOfArrayType.java");
     }
     
     @TestMetadata("FinalFieldAsVal.java")
     public void testFinalFieldAsVal() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java");
+        doTest("compiler/testData/loadJava/FinalFieldAsVal.java");
     }
     
     @TestMetadata("InnerClass.java")
     public void testInnerClass() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/InnerClass.java");
+        doTest("compiler/testData/loadJava/InnerClass.java");
     }
     
     @TestMetadata("InnerClassReferencesOuterTP.java")
     public void testInnerClassReferencesOuterTP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java");
+        doTest("compiler/testData/loadJava/InnerClassReferencesOuterTP.java");
     }
     
     @TestMetadata("InnerClassesInGeneric.java")
     public void testInnerClassesInGeneric() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java");
+        doTest("compiler/testData/loadJava/InnerClassesInGeneric.java");
     }
     
     @TestMetadata("MethodReferencesOuterClassTP.java")
     public void testMethodReferencesOuterClassTP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java");
+        doTest("compiler/testData/loadJava/MethodReferencesOuterClassTP.java");
     }
     
     @TestMetadata("MethodTypePOneUpperBound.java")
     public void testMethodTypePOneUpperBound() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java");
+        doTest("compiler/testData/loadJava/MethodTypePOneUpperBound.java");
     }
     
     @TestMetadata("MethodTypePTwoUpperBounds.java")
     public void testMethodTypePTwoUpperBounds() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java");
+        doTest("compiler/testData/loadJava/MethodTypePTwoUpperBounds.java");
     }
     
     @TestMetadata("MethodWithTypeP.java")
     public void testMethodWithTypeP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MethodWithTypeP.java");
+        doTest("compiler/testData/loadJava/MethodWithTypeP.java");
     }
     
     @TestMetadata("MethodWithTypePP.java")
     public void testMethodWithTypePP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MethodWithTypePP.java");
+        doTest("compiler/testData/loadJava/MethodWithTypePP.java");
     }
     
     @TestMetadata("MethodWithTypePRefClassP.java")
     public void testMethodWithTypePRefClassP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java");
+        doTest("compiler/testData/loadJava/MethodWithTypePRefClassP.java");
     }
     
     @TestMetadata("MethosWithPRefTP.java")
     public void testMethosWithPRefTP() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java");
+        doTest("compiler/testData/loadJava/MethosWithPRefTP.java");
     }
     
     @TestMetadata("MyException.java")
     public void testMyException() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/MyException.java");
+        doTest("compiler/testData/loadJava/MyException.java");
     }
     
     @TestMetadata("Simple.java")
     public void testSimple() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/Simple.java");
+        doTest("compiler/testData/loadJava/Simple.java");
     }
     
     @TestMetadata("TwoFields.java")
     public void testTwoFields() throws Exception {
-        doTest("compiler/testData/readJavaBinaryClass/TwoFields.java");
+        doTest("compiler/testData/loadJava/TwoFields.java");
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass/annotation")
+    @TestMetadata("compiler/testData/loadJava/annotation")
     public static class Annotation extends AbstractLoadJavaTest {
         public void testAllFilesPresentInAnnotation() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/annotation"), "java", false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/annotation"), "java", false);
         }
         
         @TestMetadata("AnnotatedAnnotation.java")
         public void testAnnotatedAnnotation() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java");
+            doTest("compiler/testData/loadJava/annotation/AnnotatedAnnotation.java");
         }
         
         @TestMetadata("AnnotatedMethod.java")
         public void testAnnotatedMethod() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java");
+            doTest("compiler/testData/loadJava/annotation/AnnotatedMethod.java");
         }
         
         @TestMetadata("SimpleAnnotation.java")
         public void testSimpleAnnotation() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java");
+            doTest("compiler/testData/loadJava/annotation/SimpleAnnotation.java");
         }
         
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass/constructor")
+    @TestMetadata("compiler/testData/loadJava/constructor")
     public static class Constructor extends AbstractLoadJavaTest {
         public void testAllFilesPresentInConstructor() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/constructor"), "java", false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/constructor"), "java", false);
         }
         
         @TestMetadata("ConstructorGenericDeep.java")
         public void testConstructorGenericDeep() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java");
+            doTest("compiler/testData/loadJava/constructor/ConstructorGenericDeep.java");
         }
         
         @TestMetadata("ConstructorGenericSimple.java")
         public void testConstructorGenericSimple() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java");
+            doTest("compiler/testData/loadJava/constructor/ConstructorGenericSimple.java");
         }
         
         @TestMetadata("ConstructorGenericUpperBound.java")
         public void testConstructorGenericUpperBound() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java");
+            doTest("compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.java");
         }
         
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass/javaBean")
+    @TestMetadata("compiler/testData/loadJava/javaBean")
     public static class JavaBean extends AbstractLoadJavaTest {
         public void testAllFilesPresentInJavaBean() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/javaBean"), "java", false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/javaBean"), "java", false);
         }
         
         @TestMetadata("DifferentGetterAndSetter.java")
         public void testDifferentGetterAndSetter() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java");
+            doTest("compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.java");
         }
         
         @TestMetadata("JavaBeanAbstractGetter.java")
         public void testJavaBeanAbstractGetter() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java");
+            doTest("compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.java");
         }
         
         @TestMetadata("JavaBeanVal.java")
         public void testJavaBeanVal() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java");
+            doTest("compiler/testData/loadJava/javaBean/JavaBeanVal.java");
         }
         
         @TestMetadata("JavaBeanVar.java")
         public void testJavaBeanVar() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java");
+            doTest("compiler/testData/loadJava/javaBean/JavaBeanVar.java");
         }
         
         @TestMetadata("JavaBeanVarOfGenericType.java")
         public void testJavaBeanVarOfGenericType() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java");
+            doTest("compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.java");
         }
         
         @TestMetadata("TwoSetters.java")
         public void testTwoSetters() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java");
+            doTest("compiler/testData/loadJava/javaBean/TwoSetters.java");
         }
         
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature")
+    @TestMetadata("compiler/testData/loadJava/kotlinSignature")
     public static class KotlinSignature extends AbstractLoadJavaTest {
         public void testAllFilesPresentInKotlinSignature() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature"), "java", false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature"), "java", false);
         }
         
         @TestMetadata("MethodWithFunctionTypes.java")
         public void testMethodWithFunctionTypes() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.java");
+            doTest("compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.java");
         }
         
         @TestMetadata("MethodWithGenerics.java")
         public void testMethodWithGenerics() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.java");
+            doTest("compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.java");
         }
         
         @TestMetadata("MethodWithTupleType.java")
         public void testMethodWithTupleType() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.java");
+            doTest("compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.java");
         }
         
         @TestMetadata("MethodWithTypeParameters.java")
         public void testMethodWithTypeParameters() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.java");
+            doTest("compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.java");
         }
         
         @TestMetadata("MethodWithVararg.java")
         public void testMethodWithVararg() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.java");
+            doTest("compiler/testData/loadJava/kotlinSignature/MethodWithVararg.java");
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature/error")
+        @TestMetadata("compiler/testData/loadJava/kotlinSignature/error")
         public static class Error extends AbstractLoadJavaTest {
             @TestMetadata("AddingNullability.java")
             public void testAddingNullability() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/AddingNullability.java");
             }
             
             public void testAllFilesPresentInError() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature/error"), "java", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature/error"), "java", false);
             }
             
             @TestMetadata("ExtraUpperBound.java")
             public void testExtraUpperBound() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.java");
             }
             
             @TestMetadata("MissingUpperBound.java")
             public void testMissingUpperBound() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.java");
             }
             
             @TestMetadata("NotVarargReplacedWithVararg.java")
             public void testNotVarargReplacedWithVararg() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.java");
             }
             
             @TestMetadata("ReturnTypeMissing.java")
             public void testReturnTypeMissing() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.java");
             }
             
             @TestMetadata("SyntaxError.java")
             public void testSyntaxError() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/SyntaxError.java");
             }
             
             @TestMetadata("VarargReplacedWithNotVararg.java")
             public void testVarargReplacedWithNotVararg() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.java");
             }
             
             @TestMetadata("WrongMethodName.java")
             public void testWrongMethodName() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java");
             }
             
             @TestMetadata("WrongReturnTypeStructure.java")
             public void testWrongReturnTypeStructure() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java");
             }
             
             @TestMetadata("WrongTypeName1.java")
             public void testWrongTypeName1() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.java");
             }
             
             @TestMetadata("WrongTypeName2.java")
             public void testWrongTypeName2() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.java");
             }
             
             @TestMetadata("WrongTypeName3.java")
             public void testWrongTypeName3() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.java");
             }
             
             @TestMetadata("WrongTypeParameterBoundStructure1.java")
             public void testWrongTypeParameterBoundStructure1() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
             }
             
             @TestMetadata("WrongTypeParameterBoundStructure2.java")
             public void testWrongTypeParameterBoundStructure2() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
             }
             
             @TestMetadata("WrongTypeParametersCount.java")
             public void testWrongTypeParametersCount() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.java");
             }
             
             @TestMetadata("WrongTypeVariance.java")
             public void testWrongTypeVariance() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java");
             }
             
             @TestMetadata("WrongValueParameterStructure1.java")
             public void testWrongValueParameterStructure1() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.java");
             }
             
             @TestMetadata("WrongValueParameterStructure2.java")
             public void testWrongValueParameterStructure2() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.java");
             }
             
             @TestMetadata("WrongValueParametersCount.java")
             public void testWrongValueParametersCount() throws Exception {
-                doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.java");
+                doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.java");
             }
             
         }
@@ -371,56 +370,56 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass/modality")
+    @TestMetadata("compiler/testData/loadJava/modality")
     public static class Modality extends AbstractLoadJavaTest {
         public void testAllFilesPresentInModality() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/modality"), "java", false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/modality"), "java", false);
         }
         
         @TestMetadata("ModalityOfFakeOverrides.java")
         public void testModalityOfFakeOverrides() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.java");
+            doTest("compiler/testData/loadJava/modality/ModalityOfFakeOverrides.java");
         }
         
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass/notNull")
+    @TestMetadata("compiler/testData/loadJava/notNull")
     public static class NotNull extends AbstractLoadJavaTest {
         public void testAllFilesPresentInNotNull() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/notNull"), "java", false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/notNull"), "java", false);
         }
         
         @TestMetadata("NotNullField.java")
         public void testNotNullField() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/notNull/NotNullField.java");
+            doTest("compiler/testData/loadJava/notNull/NotNullField.java");
         }
         
         @TestMetadata("NotNullMethod.java")
         public void testNotNullMethod() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java");
+            doTest("compiler/testData/loadJava/notNull/NotNullMethod.java");
         }
         
         @TestMetadata("NotNullParameter.java")
         public void testNotNullParameter() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java");
+            doTest("compiler/testData/loadJava/notNull/NotNullParameter.java");
         }
         
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass/vararg")
+    @TestMetadata("compiler/testData/loadJava/vararg")
     public static class Vararg extends AbstractLoadJavaTest {
         public void testAllFilesPresentInVararg() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/vararg"), "java", false);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/vararg"), "java", false);
         }
         
         @TestMetadata("VarargInt.java")
         public void testVarargInt() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/vararg/VarargInt.java");
+            doTest("compiler/testData/loadJava/vararg/VarargInt.java");
         }
         
         @TestMetadata("VarargString.java")
         public void testVarargString() throws Exception {
-            doTest("compiler/testData/readJavaBinaryClass/vararg/VarargString.java");
+            doTest("compiler/testData/loadJava/vararg/VarargString.java");
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
index da872391785..8362cc776ef 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java
@@ -87,11 +87,11 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
             "LazyResolveNamespaceComparingTestGenerated",
             AbstractLazyResolveNamespaceComparingTest.class,
             Arrays.asList(
-                    new SimpleTestClassModel(new File("compiler/testData/readKotlinBinaryClass"),
+                    new SimpleTestClassModel(new File("compiler/testData/loadKotlin"),
                                              true,
                                              extension,
                                              "doTestSinglePackage"),
-                    new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"),
+                    new SimpleTestClassModel(new File("compiler/testData/loadJava"),
                                              true,
                                              extension,
                                              "doTestSinglePackage"),
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index 905059c724f..b1768e6532a 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -24,450 +24,450 @@ import java.io.File;
 
 /** This class is generated by {@link org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest}. DO NOT MODIFY MANUALLY */
 public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyResolveNamespaceComparingTest {
-    @TestMetadata("compiler/testData/readKotlinBinaryClass")
-    public static class ReadKotlinBinaryClass extends AbstractLazyResolveNamespaceComparingTest {
-        public void testAllFilesPresentInReadKotlinBinaryClass() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass"), "kt", false);
+    @TestMetadata("compiler/testData/loadKotlin")
+    public static class LoadKotlin extends AbstractLazyResolveNamespaceComparingTest {
+        public void testAllFilesPresentInLoadKotlin() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin"), "kt", false);
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/class")
+        @TestMetadata("compiler/testData/loadKotlin/class")
         public static class Class extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInClass() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/class"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/class"), "kt", false);
             }
             
             @TestMetadata("Class.kt")
             public void testClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/Class.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/Class.kt");
             }
             
             @TestMetadata("ClassInParam.kt")
             public void testClassInParam() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassInParam.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassInParam.kt");
             }
             
             @TestMetadata("ClassInnerClass.kt")
             public void testClassInnerClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassInnerClass.kt");
             }
             
             @TestMetadata("ClassOutParam.kt")
             public void testClassOutParam() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassOutParam.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassOutParam.kt");
             }
             
             @TestMetadata("ClassParam.kt")
             public void testClassParam() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParam.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParam.kt");
             }
             
             @TestMetadata("ClassParamReferencesParam.kt")
             public void testClassParamReferencesParam() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParamReferencesParam.kt");
             }
             
             @TestMetadata("ClassParamReferencesParam2.kt")
             public void testClassParamReferencesParam2() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesParam2.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParamReferencesParam2.kt");
             }
             
             @TestMetadata("ClassParamReferencesSelf.kt")
             public void testClassParamReferencesSelf() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamReferencesSelf.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParamReferencesSelf.kt");
             }
             
             @TestMetadata("ClassParamUpperClassBound.kt")
             public void testClassParamUpperClassBound() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassBound.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParamUpperClassBound.kt");
             }
             
             @TestMetadata("ClassParamUpperClassInterfaceBound.kt")
             public void testClassParamUpperClassInterfaceBound() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperClassInterfaceBound.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParamUpperClassInterfaceBound.kt");
             }
             
             @TestMetadata("ClassParamUpperInterfaceBound.kt")
             public void testClassParamUpperInterfaceBound() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceBound.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceBound.kt");
             }
             
             @TestMetadata("ClassParamUpperInterfaceClassBound.kt")
             public void testClassParamUpperInterfaceClassBound() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassParamUpperInterfaceClassBound.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassParamUpperInterfaceClassBound.kt");
             }
             
             @TestMetadata("ClassTwoParams.kt")
             public void testClassTwoParams() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassTwoParams.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassTwoParams.kt");
             }
             
             @TestMetadata("ClassTwoParams2.kt")
             public void testClassTwoParams2() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/ClassTwoParams2.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/ClassTwoParams2.kt");
             }
             
             @TestMetadata("InheritClassSimple.kt")
             public void testInheritClassSimple() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InheritClassSimple.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/InheritClassSimple.kt");
             }
             
             @TestMetadata("InheritClassWithParam.kt")
             public void testInheritClassWithParam() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InheritClassWithParam.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/InheritClassWithParam.kt");
             }
             
             @TestMetadata("InheritTraitWithParam.kt")
             public void testInheritTraitWithParam() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InheritTraitWithParam.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/InheritTraitWithParam.kt");
             }
             
             @TestMetadata("InnerClass.kt")
             public void testInnerClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InnerClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/InnerClass.kt");
             }
             
             @TestMetadata("InnerClassExtendInnerClass.kt")
             public void testInnerClassExtendInnerClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/InnerClassExtendInnerClass.kt");
             }
             
             @TestMetadata("Trait.kt")
             public void testTrait() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/class/Trait.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/class/Trait.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/classFun")
+        @TestMetadata("compiler/testData/loadKotlin/classFun")
         public static class ClassFun extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInClassFun() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/classFun"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/classFun"), "kt", false);
             }
             
             @TestMetadata("ClassInParamUsedInFun.kt")
             public void testClassInParamUsedInFun() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classFun/ClassInParamUsedInFun.kt");
             }
             
             @TestMetadata("ClassParamUsedInFun.kt")
             public void testClassParamUsedInFun() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classFun/ClassParamUsedInFun.kt");
             }
             
             @TestMetadata("FunDelegationToTraitImpl.kt")
             public void testFunDelegationToTraitImpl() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.kt");
             }
             
             @TestMetadata("FunInParamSuper.kt")
             public void testFunInParamSuper() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classFun/FunInParamSuper.kt");
             }
             
             @TestMetadata("TraitFinalFun.kt")
             public void testTraitFinalFun() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/TraitFinalFun.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classFun/TraitFinalFun.kt");
             }
             
             @TestMetadata("TraitOpenFun.kt")
             public void testTraitOpenFun() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classFun/TraitOpenFun.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classFun/TraitOpenFun.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/classObject")
+        @TestMetadata("compiler/testData/loadKotlin/classObject")
         public static class ClassObject extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInClassObject() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/classObject"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/classObject"), "kt", false);
             }
             
             @TestMetadata("ClassObjectDeclaresVal.kt")
             public void testClassObjectDeclaresVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVal.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVal.kt");
             }
             
             @TestMetadata("ClassObjectDeclaresVar.kt")
             public void testClassObjectDeclaresVar() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectDeclaresVar.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classObject/ClassObjectDeclaresVar.kt");
             }
             
             @TestMetadata("ClassObjectExtendsTrait.kt")
             public void testClassObjectExtendsTrait() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTrait.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classObject/ClassObjectExtendsTrait.kt");
             }
             
             @TestMetadata("ClassObjectExtendsTraitWithTP.kt")
             public void testClassObjectExtendsTraitWithTP() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/ClassObjectExtendsTraitWithTP.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classObject/ClassObjectExtendsTraitWithTP.kt");
             }
             
             @TestMetadata("SimpleClassObject.kt")
             public void testSimpleClassObject() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/classObject/SimpleClassObject.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/classObject/SimpleClassObject.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/constructor")
+        @TestMetadata("compiler/testData/loadKotlin/constructor")
         public static class Constructor extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInConstructor() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/constructor"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/constructor"), "kt", false);
             }
             
             @TestMetadata("Constructor0.kt")
             public void testConstructor0() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/Constructor0.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/Constructor0.kt");
             }
             
             @TestMetadata("Constructor1.kt")
             public void testConstructor1() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/Constructor1.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/Constructor1.kt");
             }
             
             @TestMetadata("Constructor1WithParamDefaultValue.kt")
             public void testConstructor1WithParamDefaultValue() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/Constructor1WithParamDefaultValue.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/Constructor1WithParamDefaultValue.kt");
             }
             
             @TestMetadata("ConstructorCollectionParameter.kt")
             public void testConstructorCollectionParameter() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.kt");
             }
             
             @TestMetadata("ConstructorWithTwoTypeParameters.kt")
             public void testConstructorWithTwoTypeParameters() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParameters.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParameters.kt");
             }
             
             @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt")
             public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
             }
             
             @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt")
             public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
             }
             
             @TestMetadata("ConstructorWithTypeParameter.kt")
             public void testConstructorWithTypeParameter() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParameter.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/ConstructorWithTypeParameter.kt");
             }
             
             @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt")
             public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/fun")
+        @TestMetadata("compiler/testData/loadKotlin/fun")
         public static class Fun extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInFun() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/fun"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun"), "kt", false);
             }
             
-            @TestMetadata("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables")
+            @TestMetadata("compiler/testData/loadKotlin/fun/genericWithTypeVariables")
             public static class GenericWithTypeVariables extends AbstractLazyResolveNamespaceComparingTest {
                 public void testAllFilesPresentInGenericWithTypeVariables() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables"), "kt", false);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/genericWithTypeVariables"), "kt", false);
                 }
                 
                 @TestMetadata("FunGenericParam.kt")
                 public void testFunGenericParam() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunGenericParam.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
                 }
                 
                 @TestMetadata("FunInParam.kt")
                 public void testFunInParam() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunInParam.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunInParam.kt");
                 }
                 
                 @TestMetadata("FunOutParam.kt")
                 public void testFunOutParam() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunOutParam.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunOutParam.kt");
                 }
                 
                 @TestMetadata("FunParamParam.kt")
                 public void testFunParamParam() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParam.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
                 }
                 
                 @TestMetadata("FunParamParamErased.kt")
                 public void testFunParamParamErased() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamParamErased.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt");
                 }
                 
                 @TestMetadata("FunParamReferencesParam.kt")
                 public void testFunParamReferencesParam() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
                 }
                 
                 @TestMetadata("FunParamReferencesParam2.kt")
                 public void testFunParamReferencesParam2() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamReferencesParam2.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam2.kt");
                 }
                 
                 @TestMetadata("FunParamTwoUpperBounds.kt")
                 public void testFunParamTwoUpperBounds() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
                 }
                 
                 @TestMetadata("FunParamUpperClassBound.kt")
                 public void testFunParamUpperClassBound() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
                 }
                 
                 @TestMetadata("FunParamUpperClassInterfaceBound.kt")
                 public void testFunParamUpperClassInterfaceBound() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
                 }
                 
                 @TestMetadata("FunParamUpperInterfaceBound.kt")
                 public void testFunParamUpperInterfaceBound() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
                 }
                 
                 @TestMetadata("FunParamUpperInterfaceClassBound.kt")
                 public void testFunParamUpperInterfaceClassBound() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt");
                 }
                 
                 @TestMetadata("FunParamVaragParam.kt")
                 public void testFunParamVaragParam() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunParamVaragParam.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
                 }
                 
                 @TestMetadata("FunTwoTypeParams.kt")
                 public void testFunTwoTypeParams() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
                 }
                 
                 @TestMetadata("FunTwoTypeParams2.kt")
                 public void testFunTwoTypeParams2() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithTypeVariables/FunTwoTypeParams2.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams2.kt");
                 }
                 
             }
             
-            @TestMetadata("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables")
+            @TestMetadata("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables")
             public static class GenericWithoutTypeVariables extends AbstractLazyResolveNamespaceComparingTest {
                 public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables"), "kt", false);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables"), "kt", false);
                 }
                 
                 @TestMetadata("FunClassParamNotNull.kt")
                 public void testFunClassParamNotNull() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
                 }
                 
                 @TestMetadata("FunClassParamNullable.kt")
                 public void testFunClassParamNullable() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
                 }
                 
                 @TestMetadata("FunParamNullable.kt")
                 public void testFunParamNullable() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/FunParamNullable.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt");
                 }
                 
                 @TestMetadata("ReturnTypeClassParamNotNull.kt")
                 public void testReturnTypeClassParamNotNull() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
                 }
                 
                 @TestMetadata("ReturnTypeClassParamNullable.kt")
                 public void testReturnTypeClassParamNullable() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
                 }
                 
             }
             
-            @TestMetadata("compiler/testData/readKotlinBinaryClass/fun/nonGeneric")
+            @TestMetadata("compiler/testData/loadKotlin/fun/nonGeneric")
             public static class NonGeneric extends AbstractLazyResolveNamespaceComparingTest {
                 public void testAllFilesPresentInNonGeneric() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/fun/nonGeneric"), "kt", false);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/nonGeneric"), "kt", false);
                 }
                 
                 @TestMetadata("ClassFun.kt")
                 public void testClassFun() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ClassFun.kt");
                 }
                 
                 @TestMetadata("ClassFunGetFoo.kt")
                 public void testClassFunGetFoo() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFoo.kt");
                 }
                 
                 @TestMetadata("ClassFunGetFooSetFoo.kt")
                 public void testClassFunGetFooSetFoo() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
                 }
                 
                 @TestMetadata("ClassFunSetFoo.kt")
                 public void testClassFunSetFoo() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ClassFunSetFoo.kt");
                 }
                 
                 @TestMetadata("ExtFun.kt")
                 public void testExtFun() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFun.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.kt");
                 }
                 
                 @TestMetadata("ExtFunInClass.kt")
                 public void testExtFunInClass() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ExtFunInClass.kt");
                 }
                 
                 @TestMetadata("FunDefaultArg.kt")
                 public void testFunDefaultArg() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunDefaultArg.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.kt");
                 }
                 
                 @TestMetadata("FunParamNotNull.kt")
                 public void testFunParamNotNull() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunParamNotNull.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.kt");
                 }
                 
                 @TestMetadata("FunVarargInt.kt")
                 public void testFunVarargInt() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInt.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.kt");
                 }
                 
                 @TestMetadata("FunVarargInteger.kt")
                 public void testFunVarargInteger() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/FunVarargInteger.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.kt");
                 }
                 
                 @TestMetadata("ModifierAbstract.kt")
                 public void testModifierAbstract() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ModifierAbstract.kt");
                 }
                 
                 @TestMetadata("ModifierOpen.kt")
                 public void testModifierOpen() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ModifierOpen.kt");
                 }
                 
                 @TestMetadata("NsFun.kt")
                 public void testNsFun() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFun.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/NsFun.kt");
                 }
                 
                 @TestMetadata("NsFunGetFoo.kt")
                 public void testNsFunGetFoo() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/NsFunGetFoo.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.kt");
                 }
                 
                 @TestMetadata("ReturnTypeNotNull.kt")
                 public void testReturnTypeNotNull() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNotNull.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.kt");
                 }
                 
                 @TestMetadata("ReturnTypeNullable.kt")
                 public void testReturnTypeNullable() throws Exception {
-                    doTestSinglePackage("compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ReturnTypeNullable.kt");
+                    doTestSinglePackage("compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.kt");
                 }
                 
             }
@@ -482,363 +482,363 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             }
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/prop")
+        @TestMetadata("compiler/testData/loadKotlin/prop")
         public static class Prop extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInProp() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/prop"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/prop"), "kt", false);
             }
             
             @TestMetadata("ClassVal.kt")
             public void testClassVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ClassVal.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ClassVal.kt");
             }
             
             @TestMetadata("ClassValAbstract.kt")
             public void testClassValAbstract() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ClassValAbstract.kt");
             }
             
             @TestMetadata("ClassVar.kt")
             public void testClassVar() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ClassVar.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ClassVar.kt");
             }
             
             @TestMetadata("CollectionSize.kt")
             public void testCollectionSize() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/CollectionSize.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/CollectionSize.kt");
             }
             
             @TestMetadata("ExtValClass.kt")
             public void testExtValClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValClass.kt");
             }
             
             @TestMetadata("ExtValInClass.kt")
             public void testExtValInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValInClass.kt");
             }
             
             @TestMetadata("ExtValInt.kt")
             public void testExtValInt() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValInt.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValInt.kt");
             }
             
             @TestMetadata("ExtValIntCharSequence.kt")
             public void testExtValIntCharSequence() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequence.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValIntCharSequence.kt");
             }
             
             @TestMetadata("ExtValIntCharSequenceQ.kt")
             public void testExtValIntCharSequenceQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntCharSequenceQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.kt");
             }
             
             @TestMetadata("ExtValIntListQOfIntInClass.kt")
             public void testExtValIntListQOfIntInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValIntListQOfIntInClass.kt");
             }
             
             @TestMetadata("ExtValIntTInClass.kt")
             public void testExtValIntTInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValIntTInClass.kt");
             }
             
             @TestMetadata("ExtValIntTQInClass.kt")
             public void testExtValIntTQInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValIntTQInClass.kt");
             }
             
             @TestMetadata("ExtValTIntInClass.kt")
             public void testExtValTIntInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtValTIntInClass.kt");
             }
             
             @TestMetadata("ExtVarClass.kt")
             public void testExtVarClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarClass.kt");
             }
             
             @TestMetadata("ExtVarInClass.kt")
             public void testExtVarInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarInClass.kt");
             }
             
             @TestMetadata("ExtVarInt.kt")
             public void testExtVarInt() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarInt.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarInt.kt");
             }
             
             @TestMetadata("ExtVarIntTInClass.kt")
             public void testExtVarIntTInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarIntTInClass.kt");
             }
             
             @TestMetadata("ExtVarIntTQInClass.kt")
             public void testExtVarIntTQInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarIntTQInClass.kt");
             }
             
             @TestMetadata("ExtVarMapPQInt.kt")
             public void testExtVarMapPQInt() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarMapPQInt.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarMapPQInt.kt");
             }
             
             @TestMetadata("ExtVarTIntInClass.kt")
             public void testExtVarTIntInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarTIntInClass.kt");
             }
             
             @TestMetadata("ExtVarTQIntInClass.kt")
             public void testExtVarTQIntInClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarTQIntInClass.kt");
             }
             
             @TestMetadata("ExtVarl.kt")
             public void testExtVarl() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/ExtVarl.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/ExtVarl.kt");
             }
             
             @TestMetadata("NsVal.kt")
             public void testNsVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/NsVal.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/NsVal.kt");
             }
             
             @TestMetadata("NsVar.kt")
             public void testNsVar() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/NsVar.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/NsVar.kt");
             }
             
             @TestMetadata("OverrideClassVal.kt")
             public void testOverrideClassVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/OverrideClassVal.kt");
             }
             
             @TestMetadata("OverrideTraitVal.kt")
             public void testOverrideTraitVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/OverrideTraitVal.kt");
             }
             
             @TestMetadata("PropFromSuperclass.kt")
             public void testPropFromSuperclass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/PropFromSuperclass.kt");
             }
             
             @TestMetadata("TraitFinalVar.kt")
             public void testTraitFinalVar() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/TraitFinalVar.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/TraitFinalVar.kt");
             }
             
             @TestMetadata("TraitOpenVal.kt")
             public void testTraitOpenVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/TraitOpenVal.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/TraitOpenVal.kt");
             }
             
             @TestMetadata("VarDelegationToTraitImpl.kt")
             public void testVarDelegationToTraitImpl() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/type")
+        @TestMetadata("compiler/testData/loadKotlin/type")
         public static class Type extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInType() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/type"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/type"), "kt", false);
             }
             
             @TestMetadata("Any.kt")
             public void testAny() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Any.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/Any.kt");
             }
             
             @TestMetadata("AnyQ.kt")
             public void testAnyQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/AnyQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/AnyQ.kt");
             }
             
             @TestMetadata("ArrayOfInt.kt")
             public void testArrayOfInt() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ArrayOfInt.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ArrayOfInt.kt");
             }
             
             @TestMetadata("ArrayOfInteger.kt")
             public void testArrayOfInteger() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ArrayOfInteger.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ArrayOfInteger.kt");
             }
             
             @TestMetadata("ArrayOfString.kt")
             public void testArrayOfString() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ArrayOfString.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ArrayOfString.kt");
             }
             
             @TestMetadata("Function1IntString.kt")
             public void testFunction1IntString() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Function1IntString.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/Function1IntString.kt");
             }
             
             @TestMetadata("Int.kt")
             public void testInt() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Int.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/Int.kt");
             }
             
             @TestMetadata("IntArray.kt")
             public void testIntArray() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/IntArray.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/IntArray.kt");
             }
             
             @TestMetadata("IntQ.kt")
             public void testIntQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/IntQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/IntQ.kt");
             }
             
             @TestMetadata("jlInteger.kt")
             public void testJlInteger() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlInteger.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/jlInteger.kt");
             }
             
             @TestMetadata("jlIntegerQ.kt")
             public void testJlIntegerQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlIntegerQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/jlIntegerQ.kt");
             }
             
             @TestMetadata("jlNumber.kt")
             public void testJlNumber() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlNumber.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/jlNumber.kt");
             }
             
             @TestMetadata("jlObject.kt")
             public void testJlObject() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlObject.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/jlObject.kt");
             }
             
             @TestMetadata("jlObjectQ.kt")
             public void testJlObjectQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlObjectQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/jlObjectQ.kt");
             }
             
             @TestMetadata("jlString.kt")
             public void testJlString() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlString.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/jlString.kt");
             }
             
             @TestMetadata("jlStringQ.kt")
             public void testJlStringQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/jlStringQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/jlStringQ.kt");
             }
             
             @TestMetadata("ListOfAny.kt")
             public void testListOfAny() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfAny.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ListOfAny.kt");
             }
             
             @TestMetadata("ListOfAnyQ.kt")
             public void testListOfAnyQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfAnyQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ListOfAnyQ.kt");
             }
             
             @TestMetadata("ListOfStar.kt")
             public void testListOfStar() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfStar.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ListOfStar.kt");
             }
             
             @TestMetadata("ListOfString.kt")
             public void testListOfString() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfString.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ListOfString.kt");
             }
             
             @TestMetadata("ListOfjlString.kt")
             public void testListOfjlString() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/ListOfjlString.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/ListOfjlString.kt");
             }
             
             @TestMetadata("Nothing.kt")
             public void testNothing() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Nothing.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/Nothing.kt");
             }
             
             @TestMetadata("NothingQ.kt")
             public void testNothingQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/NothingQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/NothingQ.kt");
             }
             
             @TestMetadata("String.kt")
             public void testString() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/String.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/String.kt");
             }
             
             @TestMetadata("StringQ.kt")
             public void testStringQ() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/StringQ.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/StringQ.kt");
             }
             
             @TestMetadata("Tuple0.kt")
             public void testTuple0() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/type/Tuple0.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/type/Tuple0.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readKotlinBinaryClass/visibility")
+        @TestMetadata("compiler/testData/loadKotlin/visibility")
         public static class Visibility extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInVisibility() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readKotlinBinaryClass/visibility"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/visibility"), "kt", false);
             }
             
             @TestMetadata("InternalAbstractTraitMembersOverridden.kt")
             public void testInternalAbstractTraitMembersOverridden() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/InternalAbstractTraitMembersOverridden.kt");
             }
             
             @TestMetadata("InternalClass.kt")
             public void testInternalClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/InternalClass.kt");
             }
             
             @TestMetadata("InternalConstructor.kt")
             public void testInternalConstructor() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalConstructor.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/InternalConstructor.kt");
             }
             
             @TestMetadata("InternalTopLevelMembers.kt")
             public void testInternalTopLevelMembers() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTopLevelMembers.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.kt");
             }
             
             @TestMetadata("InternalTraitMembers.kt")
             public void testInternalTraitMembers() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/InternalTraitMembers.kt");
             }
             
             @TestMetadata("InternalTraitMembersInherited.kt")
             public void testInternalTraitMembersInherited() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.kt");
             }
             
             @TestMetadata("PrivateClass.kt")
             public void testPrivateClass() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/PrivateClass.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/PrivateClass.kt");
             }
             
             @TestMetadata("PrivateTopLevelFun.kt")
             public void testPrivateTopLevelFun() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelFun.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.kt");
             }
             
             @TestMetadata("PrivateTopLevelVal.kt")
             public void testPrivateTopLevelVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/PrivateTopLevelVal.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.kt");
             }
             
             @TestMetadata("TopLevelVarWithPrivateSetter.kt")
             public void testTopLevelVarWithPrivateSetter() throws Exception {
-                doTestSinglePackage("compiler/testData/readKotlinBinaryClass/visibility/TopLevelVarWithPrivateSetter.kt");
+                doTestSinglePackage("compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.kt");
             }
             
         }
         
         public static Test innerSuite() {
-            TestSuite suite = new TestSuite("ReadKotlinBinaryClass");
-            suite.addTestSuite(ReadKotlinBinaryClass.class);
+            TestSuite suite = new TestSuite("LoadKotlin");
+            suite.addTestSuite(LoadKotlin.class);
             suite.addTestSuite(Class.class);
             suite.addTestSuite(ClassFun.class);
             suite.addTestSuite(ClassObject.class);
@@ -851,341 +851,341 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
         }
     }
     
-    @TestMetadata("compiler/testData/readJavaBinaryClass")
-    public static class ReadJavaBinaryClass extends AbstractLazyResolveNamespaceComparingTest {
-        public void testAllFilesPresentInReadJavaBinaryClass() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass"), "kt", false);
+    @TestMetadata("compiler/testData/loadJava")
+    public static class LoadJava extends AbstractLazyResolveNamespaceComparingTest {
+        public void testAllFilesPresentInLoadJava() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava"), "kt", false);
         }
         
         @TestMetadata("ArrayTypeVariance.kt")
         public void testArrayTypeVariance() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/ArrayTypeVariance.kt");
+            doTestSinglePackage("compiler/testData/loadJava/ArrayTypeVariance.kt");
         }
         
         @TestMetadata("ClassDoesNotOverrideMethod.kt")
         public void testClassDoesNotOverrideMethod() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.kt");
+            doTestSinglePackage("compiler/testData/loadJava/ClassDoesNotOverrideMethod.kt");
         }
         
         @TestMetadata("ClassWithTypeP.kt")
         public void testClassWithTypeP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/ClassWithTypeP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/ClassWithTypeP.kt");
         }
         
         @TestMetadata("ClassWithTypePExtendsIterableP.kt")
         public void testClassWithTypePExtendsIterableP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/ClassWithTypePExtendsIterableP.kt");
         }
         
         @TestMetadata("ClassWithTypePP.kt")
         public void testClassWithTypePP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/ClassWithTypePP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/ClassWithTypePP.kt");
         }
         
         @TestMetadata("ClassWithTypePRefNext.kt")
         public void testClassWithTypePRefNext() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.kt");
+            doTestSinglePackage("compiler/testData/loadJava/ClassWithTypePRefNext.kt");
         }
         
         @TestMetadata("ClassWithTypePRefSelf.kt")
         public void testClassWithTypePRefSelf() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.kt");
+            doTestSinglePackage("compiler/testData/loadJava/ClassWithTypePRefSelf.kt");
         }
         
         @TestMetadata("FieldAsVar.kt")
         public void testFieldAsVar() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/FieldAsVar.kt");
+            doTestSinglePackage("compiler/testData/loadJava/FieldAsVar.kt");
         }
         
         @TestMetadata("FieldOfArrayType.kt")
         public void testFieldOfArrayType() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/FieldOfArrayType.kt");
+            doTestSinglePackage("compiler/testData/loadJava/FieldOfArrayType.kt");
         }
         
         @TestMetadata("FinalFieldAsVal.kt")
         public void testFinalFieldAsVal() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt");
+            doTestSinglePackage("compiler/testData/loadJava/FinalFieldAsVal.kt");
         }
         
         @TestMetadata("InnerClass.kt")
         public void testInnerClass() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/InnerClass.kt");
+            doTestSinglePackage("compiler/testData/loadJava/InnerClass.kt");
         }
         
         @TestMetadata("InnerClassReferencesOuterTP.kt")
         public void testInnerClassReferencesOuterTP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/InnerClassReferencesOuterTP.kt");
         }
         
         @TestMetadata("InnerClassesInGeneric.kt")
         public void testInnerClassesInGeneric() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.kt");
+            doTestSinglePackage("compiler/testData/loadJava/InnerClassesInGeneric.kt");
         }
         
         @TestMetadata("MethodReferencesOuterClassTP.kt")
         public void testMethodReferencesOuterClassTP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MethodReferencesOuterClassTP.kt");
         }
         
         @TestMetadata("MethodTypePOneUpperBound.kt")
         public void testMethodTypePOneUpperBound() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MethodTypePOneUpperBound.kt");
         }
         
         @TestMetadata("MethodTypePTwoUpperBounds.kt")
         public void testMethodTypePTwoUpperBounds() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MethodTypePTwoUpperBounds.kt");
         }
         
         @TestMetadata("MethodWithTypeP.kt")
         public void testMethodWithTypeP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MethodWithTypeP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MethodWithTypeP.kt");
         }
         
         @TestMetadata("MethodWithTypePP.kt")
         public void testMethodWithTypePP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MethodWithTypePP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MethodWithTypePP.kt");
         }
         
         @TestMetadata("MethodWithTypePRefClassP.kt")
         public void testMethodWithTypePRefClassP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MethodWithTypePRefClassP.kt");
         }
         
         @TestMetadata("MethosWithPRefTP.kt")
         public void testMethosWithPRefTP() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MethosWithPRefTP.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MethosWithPRefTP.kt");
         }
         
         @TestMetadata("MyException.kt")
         public void testMyException() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/MyException.kt");
+            doTestSinglePackage("compiler/testData/loadJava/MyException.kt");
         }
         
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/Simple.kt");
+            doTestSinglePackage("compiler/testData/loadJava/Simple.kt");
         }
         
         @TestMetadata("TwoFields.kt")
         public void testTwoFields() throws Exception {
-            doTestSinglePackage("compiler/testData/readJavaBinaryClass/TwoFields.kt");
+            doTestSinglePackage("compiler/testData/loadJava/TwoFields.kt");
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/annotation")
+        @TestMetadata("compiler/testData/loadJava/annotation")
         public static class Annotation extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInAnnotation() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/annotation"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/annotation"), "kt", false);
             }
             
             @TestMetadata("AnnotatedAnnotation.kt")
             public void testAnnotatedAnnotation() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.kt");
+                doTestSinglePackage("compiler/testData/loadJava/annotation/AnnotatedAnnotation.kt");
             }
             
             @TestMetadata("AnnotatedMethod.kt")
             public void testAnnotatedMethod() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.kt");
+                doTestSinglePackage("compiler/testData/loadJava/annotation/AnnotatedMethod.kt");
             }
             
             @TestMetadata("SimpleAnnotation.kt")
             public void testSimpleAnnotation() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.kt");
+                doTestSinglePackage("compiler/testData/loadJava/annotation/SimpleAnnotation.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/constructor")
+        @TestMetadata("compiler/testData/loadJava/constructor")
         public static class Constructor extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInConstructor() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/constructor"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/constructor"), "kt", false);
             }
             
             @TestMetadata("ConstructorGenericDeep.kt")
             public void testConstructorGenericDeep() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt");
+                doTestSinglePackage("compiler/testData/loadJava/constructor/ConstructorGenericDeep.kt");
             }
             
             @TestMetadata("ConstructorGenericSimple.kt")
             public void testConstructorGenericSimple() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt");
+                doTestSinglePackage("compiler/testData/loadJava/constructor/ConstructorGenericSimple.kt");
             }
             
             @TestMetadata("ConstructorGenericUpperBound.kt")
             public void testConstructorGenericUpperBound() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt");
+                doTestSinglePackage("compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/javaBean")
+        @TestMetadata("compiler/testData/loadJava/javaBean")
         public static class JavaBean extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInJavaBean() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/javaBean"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/javaBean"), "kt", false);
             }
             
             @TestMetadata("DifferentGetterAndSetter.kt")
             public void testDifferentGetterAndSetter() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.kt");
+                doTestSinglePackage("compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.kt");
             }
             
             @TestMetadata("JavaBeanAbstractGetter.kt")
             public void testJavaBeanAbstractGetter() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.kt");
+                doTestSinglePackage("compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.kt");
             }
             
             @TestMetadata("JavaBeanVal.kt")
             public void testJavaBeanVal() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.kt");
+                doTestSinglePackage("compiler/testData/loadJava/javaBean/JavaBeanVal.kt");
             }
             
             @TestMetadata("JavaBeanVar.kt")
             public void testJavaBeanVar() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.kt");
+                doTestSinglePackage("compiler/testData/loadJava/javaBean/JavaBeanVar.kt");
             }
             
             @TestMetadata("JavaBeanVarOfGenericType.kt")
             public void testJavaBeanVarOfGenericType() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.kt");
+                doTestSinglePackage("compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.kt");
             }
             
             @TestMetadata("TwoSetters.kt")
             public void testTwoSetters() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.kt");
+                doTestSinglePackage("compiler/testData/loadJava/javaBean/TwoSetters.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature")
+        @TestMetadata("compiler/testData/loadJava/kotlinSignature")
         public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInKotlinSignature() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/kotlinSignature"), "kt", false);
             }
             
             @TestMetadata("MethodWithFunctionTypes.kt")
             public void testMethodWithFunctionTypes() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.kt");
+                doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.kt");
             }
             
             @TestMetadata("MethodWithGenerics.kt")
             public void testMethodWithGenerics() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.kt");
+                doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.kt");
             }
             
             @TestMetadata("MethodWithTupleType.kt")
             public void testMethodWithTupleType() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.kt");
+                doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.kt");
             }
             
             @TestMetadata("MethodWithTypeParameters.kt")
             public void testMethodWithTypeParameters() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.kt");
+                doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.kt");
             }
             
             @TestMetadata("MethodWithVararg.kt")
             public void testMethodWithVararg() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.kt");
+                doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/MethodWithVararg.kt");
             }
             
-            @TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature/error")
+            @TestMetadata("compiler/testData/loadJava/kotlinSignature/error")
             public static class Error extends AbstractLazyResolveNamespaceComparingTest {
                 @TestMetadata("AddingNullability.kt")
                 public void testAddingNullability() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/AddingNullability.kt");
                 }
                 
                 public void testAllFilesPresentInError() throws Exception {
-                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature/error"), "kt", false);
+                    JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/kotlinSignature/error"), "kt", false);
                 }
                 
                 @TestMetadata("ExtraUpperBound.kt")
                 public void testExtraUpperBound() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.kt");
                 }
                 
                 @TestMetadata("MissingUpperBound.kt")
                 public void testMissingUpperBound() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.kt");
                 }
                 
                 @TestMetadata("NotVarargReplacedWithVararg.kt")
                 public void testNotVarargReplacedWithVararg() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
                 }
                 
                 @TestMetadata("ReturnTypeMissing.kt")
                 public void testReturnTypeMissing() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.kt");
                 }
                 
                 @TestMetadata("SyntaxError.kt")
                 public void testSyntaxError() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/SyntaxError.kt");
                 }
                 
                 @TestMetadata("VarargReplacedWithNotVararg.kt")
                 public void testVarargReplacedWithNotVararg() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
                 }
                 
                 @TestMetadata("WrongMethodName.kt")
                 public void testWrongMethodName() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.kt");
                 }
                 
                 @TestMetadata("WrongReturnTypeStructure.kt")
                 public void testWrongReturnTypeStructure() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
                 }
                 
                 @TestMetadata("WrongTypeName1.kt")
                 public void testWrongTypeName1() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.kt");
                 }
                 
                 @TestMetadata("WrongTypeName2.kt")
                 public void testWrongTypeName2() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.kt");
                 }
                 
                 @TestMetadata("WrongTypeName3.kt")
                 public void testWrongTypeName3() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.kt");
                 }
                 
                 @TestMetadata("WrongTypeParameterBoundStructure1.kt")
                 public void testWrongTypeParameterBoundStructure1() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
                 }
                 
                 @TestMetadata("WrongTypeParameterBoundStructure2.kt")
                 public void testWrongTypeParameterBoundStructure2() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
                 }
                 
                 @TestMetadata("WrongTypeParametersCount.kt")
                 public void testWrongTypeParametersCount() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
                 }
                 
                 @TestMetadata("WrongTypeVariance.kt")
                 public void testWrongTypeVariance() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt");
                 }
                 
                 @TestMetadata("WrongValueParameterStructure1.kt")
                 public void testWrongValueParameterStructure1() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");
                 }
                 
                 @TestMetadata("WrongValueParameterStructure2.kt")
                 public void testWrongValueParameterStructure2() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.kt");
                 }
                 
                 @TestMetadata("WrongValueParametersCount.kt")
                 public void testWrongValueParametersCount() throws Exception {
-                    doTestSinglePackage("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.kt");
+                    doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.kt");
                 }
                 
             }
@@ -1198,63 +1198,63 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             }
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/modality")
+        @TestMetadata("compiler/testData/loadJava/modality")
         public static class Modality extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInModality() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/modality"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/modality"), "kt", false);
             }
             
             @TestMetadata("ModalityOfFakeOverrides.kt")
             public void testModalityOfFakeOverrides() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.kt");
+                doTestSinglePackage("compiler/testData/loadJava/modality/ModalityOfFakeOverrides.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/notNull")
+        @TestMetadata("compiler/testData/loadJava/notNull")
         public static class NotNull extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInNotNull() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/notNull"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/notNull"), "kt", false);
             }
             
             @TestMetadata("NotNullField.kt")
             public void testNotNullField() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/notNull/NotNullField.kt");
+                doTestSinglePackage("compiler/testData/loadJava/notNull/NotNullField.kt");
             }
             
             @TestMetadata("NotNullMethod.kt")
             public void testNotNullMethod() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.kt");
+                doTestSinglePackage("compiler/testData/loadJava/notNull/NotNullMethod.kt");
             }
             
             @TestMetadata("NotNullParameter.kt")
             public void testNotNullParameter() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.kt");
+                doTestSinglePackage("compiler/testData/loadJava/notNull/NotNullParameter.kt");
             }
             
         }
         
-        @TestMetadata("compiler/testData/readJavaBinaryClass/vararg")
+        @TestMetadata("compiler/testData/loadJava/vararg")
         public static class Vararg extends AbstractLazyResolveNamespaceComparingTest {
             public void testAllFilesPresentInVararg() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/readJavaBinaryClass/vararg"), "kt", false);
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/vararg"), "kt", false);
             }
             
             @TestMetadata("VarargInt.kt")
             public void testVarargInt() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/vararg/VarargInt.kt");
+                doTestSinglePackage("compiler/testData/loadJava/vararg/VarargInt.kt");
             }
             
             @TestMetadata("VarargString.kt")
             public void testVarargString() throws Exception {
-                doTestSinglePackage("compiler/testData/readJavaBinaryClass/vararg/VarargString.kt");
+                doTestSinglePackage("compiler/testData/loadJava/vararg/VarargString.kt");
             }
             
         }
         
         public static Test innerSuite() {
-            TestSuite suite = new TestSuite("ReadJavaBinaryClass");
-            suite.addTestSuite(ReadJavaBinaryClass.class);
+            TestSuite suite = new TestSuite("LoadJava");
+            suite.addTestSuite(LoadJava.class);
             suite.addTestSuite(Annotation.class);
             suite.addTestSuite(Constructor.class);
             suite.addTestSuite(JavaBean.class);
@@ -1321,8 +1321,8 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
     
     public static Test suite() {
         TestSuite suite = new TestSuite("LazyResolveNamespaceComparingTestGenerated");
-        suite.addTest(ReadKotlinBinaryClass.innerSuite());
-        suite.addTest(ReadJavaBinaryClass.innerSuite());
+        suite.addTest(LoadKotlin.innerSuite());
+        suite.addTest(LoadJava.innerSuite());
         suite.addTestSuite(NamespaceComparator.class);
         return suite;
     }