diff --git a/src/META-INF/MANIFEST.MF b/j2k/src/META-INF/MANIFEST.MF
similarity index 100%
rename from src/META-INF/MANIFEST.MF
rename to j2k/src/META-INF/MANIFEST.MF
diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/Converter.kt
rename to j2k/src/org/jetbrains/jet/j2k/Converter.kt
diff --git a/src/org/jetbrains/jet/j2k/J2KConverterFlags.kt b/j2k/src/org/jetbrains/jet/j2k/J2KConverterFlags.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/J2KConverterFlags.kt
rename to j2k/src/org/jetbrains/jet/j2k/J2KConverterFlags.kt
diff --git a/src/org/jetbrains/jet/j2k/JavaToKotlinCli.java b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinCli.java
similarity index 100%
rename from src/org/jetbrains/jet/j2k/JavaToKotlinCli.java
rename to j2k/src/org/jetbrains/jet/j2k/JavaToKotlinCli.java
diff --git a/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java
similarity index 100%
rename from src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java
rename to j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java
diff --git a/src/org/jetbrains/jet/j2k/SetupJavaCoreEnvironmentException.kt b/j2k/src/org/jetbrains/jet/j2k/SetupJavaCoreEnvironmentException.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/SetupJavaCoreEnvironmentException.kt
rename to j2k/src/org/jetbrains/jet/j2k/SetupJavaCoreEnvironmentException.kt
diff --git a/src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt b/j2k/src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt
rename to j2k/src/org/jetbrains/jet/j2k/actions/JavaToKotlinAction.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt b/j2k/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt b/j2k/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/AssertStatement.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/AssertStatement.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Block.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Block.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Block.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Block.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Class.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Class.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Constructor.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Constructor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Constructor.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Constructor.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/DummyStringExpression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/DummyStringExpression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/DummyStringExpression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/DummyStringExpression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Element.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Element.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Element.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Element.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Enum.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Enum.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Enum.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Enum.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt b/j2k/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/EnumConstant.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Expression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Expression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Expression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Expression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/ExpressionList.kt b/j2k/src/org/jetbrains/jet/j2k/ast/ExpressionList.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/ExpressionList.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/ExpressionList.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Expressions.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Expressions.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Expressions.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Expressions.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Field.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Field.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Field.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Field.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/File.kt b/j2k/src/org/jetbrains/jet/j2k/ast/File.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/File.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/File.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Function.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Function.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Function.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Function.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Identifier.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Identifier.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Identifier.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Identifier.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Import.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Import.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Import.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Import.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Initializer.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Initializer.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Initializer.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Initializer.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt b/j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/LocalVariable.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Member.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Member.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Member.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Member.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Modifier.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Modifier.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Modifier.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Node.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Node.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Node.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Node.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Parameter.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Parameter.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Parameter.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Parameter.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/ParameterList.kt b/j2k/src/org/jetbrains/jet/j2k/ast/ParameterList.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/ParameterList.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/ParameterList.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt b/j2k/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt b/j2k/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Statements.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Statements.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Trait.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Trait.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Trait.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Trait.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/TypeElement.kt b/j2k/src/org/jetbrains/jet/j2k/ast/TypeElement.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/TypeElement.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/TypeElement.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/TypeParameter.kt b/j2k/src/org/jetbrains/jet/j2k/ast/TypeParameter.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/TypeParameter.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/TypeParameter.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/Util.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Util.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/Util.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/Util.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/ArrayType.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/ArrayType.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/ArrayType.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/ArrayType.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/ClassType.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/EmptyType.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/EmptyType.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/EmptyType.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/EmptyType.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/InProjectionType.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/InProjectionType.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/InProjectionType.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/InProjectionType.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/OutProjectionType.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/OutProjectionType.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/OutProjectionType.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/OutProjectionType.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/PrimitiveType.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/PrimitiveType.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/PrimitiveType.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/PrimitiveType.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/StarProjectionType.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/StarProjectionType.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/StarProjectionType.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/StarProjectionType.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/Type.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/Type.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/Type.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/Type.kt
diff --git a/src/org/jetbrains/jet/j2k/ast/types/VarArg.kt b/j2k/src/org/jetbrains/jet/j2k/ast/types/VarArg.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/ast/types/VarArg.kt
rename to j2k/src/org/jetbrains/jet/j2k/ast/types/VarArg.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/Dispatcher.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/Dispatcher.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/Dispatcher.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/Dispatcher.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/SuperVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/SuperVisitor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/SuperVisitor.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/SuperVisitor.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt
diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
similarity index 100%
rename from src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
rename to j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt
diff --git a/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java b/j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java
similarity index 100%
rename from tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java
rename to j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java
diff --git a/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java b/j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java
similarity index 100%
rename from tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java
rename to j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav
similarity index 100%
rename from tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.kt
similarity index 100%
rename from tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.kt
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav
similarity index 100%
rename from tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.kt
similarity index 100%
rename from tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.kt
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt
index ea4fcc7e35e..a55da469576 100644
--- a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt
+++ b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt
@@ -1 +1 @@
-var d2 : Array<IntArray?>? = Array<IntArray?>(5)
\ No newline at end of file
+var d2 : Array<IntArray?>? = arrayOfNulls<IntArray?>(5)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt
index 95be479049e..76a8da1a13f 100644
--- a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt
+++ b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt
@@ -1 +1 @@
-var d3 : Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, {Array<IntArray?>(5)})
\ No newline at end of file
+var d3 : Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, {arrayOfNulls<IntArray?>(5)})
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt
index a4786c4ecb1..ada23e19294 100644
--- a/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt
+++ b/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt
@@ -1 +1 @@
-var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, {Array<String?>(5)})
\ No newline at end of file
+var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt
index 7e3bd1cb471..2657bcc524c 100644
--- a/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt
+++ b/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt
@@ -1 +1 @@
-var sss : Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, {Array<Array<String?>?>(5, {Array<String?>(5)})})
\ No newline at end of file
+var sss : Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, {Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})})
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/file/nullability.jav b/j2k/tests/testData/ast/assignmentExpression/file/nullability.jav
similarity index 100%
rename from tests/testData/ast/assignmentExpression/file/nullability.jav
rename to j2k/tests/testData/ast/assignmentExpression/file/nullability.jav
diff --git a/tests/testData/ast/assignmentExpression/file/nullability.kt b/j2k/tests/testData/ast/assignmentExpression/file/nullability.kt
similarity index 100%
rename from tests/testData/ast/assignmentExpression/file/nullability.kt
rename to j2k/tests/testData/ast/assignmentExpression/file/nullability.kt
diff --git a/tests/testData/ast/boxedType/file/Boxing.jav b/j2k/tests/testData/ast/boxedType/file/Boxing.jav
similarity index 100%
rename from tests/testData/ast/boxedType/file/Boxing.jav
rename to j2k/tests/testData/ast/boxedType/file/Boxing.jav
diff --git a/tests/testData/ast/boxedType/file/Boxing.kt b/j2k/tests/testData/ast/boxedType/file/Boxing.kt
similarity index 100%
rename from tests/testData/ast/boxedType/file/Boxing.kt
rename to j2k/tests/testData/ast/boxedType/file/Boxing.kt
diff --git a/j2k/tests/testData/ast/boxedType/file/kt-671.jav b/j2k/tests/testData/ast/boxedType/file/kt-671.jav
index 520765b7b08..c0ba6a8bc30 100644
--- a/j2k/tests/testData/ast/boxedType/file/kt-671.jav
+++ b/j2k/tests/testData/ast/boxedType/file/kt-671.jav
@@ -3,6 +3,7 @@ package demo;
 class Test {
   void test() {
     Integer i = Integer.valueOf(100);
-    Short s = Short.valueOf(100);
+    short s = 3;
+    Short ss = Short.valueOf(s);
   }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/file/kt-671.kt b/j2k/tests/testData/ast/boxedType/file/kt-671.kt
index 11419363e4b..bb5c163ee24 100644
--- a/j2k/tests/testData/ast/boxedType/file/kt-671.kt
+++ b/j2k/tests/testData/ast/boxedType/file/kt-671.kt
@@ -2,6 +2,7 @@ package demo
 open class Test() {
 open fun test() : Unit {
 var i : Int? = Integer.valueOf(100)
-var s : Short? = Short.valueOf(100)
+var s : Short = 3
+var ss : Short? = java.lang.Short.valueOf(s)
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/class/file/ClassShadowing.jav b/j2k/tests/testData/ast/class/file/ClassShadowing.jav
similarity index 100%
rename from tests/testData/ast/class/file/ClassShadowing.jav
rename to j2k/tests/testData/ast/class/file/ClassShadowing.jav
diff --git a/tests/testData/ast/class/file/ClassShadowing.kt b/j2k/tests/testData/ast/class/file/ClassShadowing.kt
similarity index 100%
rename from tests/testData/ast/class/file/ClassShadowing.kt
rename to j2k/tests/testData/ast/class/file/ClassShadowing.kt
diff --git a/j2k/tests/testData/ast/class/file/privateInit.kt b/j2k/tests/testData/ast/class/file/privateInit.kt
index dc753237186..4f86265d153 100644
--- a/j2k/tests/testData/ast/class/file/privateInit.kt
+++ b/j2k/tests/testData/ast/class/file/privateInit.kt
@@ -1,4 +1,4 @@
 public open class MyClass() {
-private open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
+private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/customerBuilder.kt b/j2k/tests/testData/ast/constructors/file/customerBuilder.kt
index f733dd050f4..b2573d9b469 100644
--- a/j2k/tests/testData/ast/constructors/file/customerBuilder.kt
+++ b/j2k/tests/testData/ast/constructors/file/customerBuilder.kt
@@ -8,9 +8,9 @@ return _firstName
 public open fun getLastName() : String? {
 return _lastName
 }
-private open fun doSmthBefore() : Unit {
+private fun doSmthBefore() : Unit {
 }
-private open fun doSmthAfter() : Unit {
+private fun doSmthAfter() : Unit {
 }
 {
 doSmthBefore()
diff --git a/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt
index d049a45adce..e237eeee52d 100644
--- a/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt
+++ b/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt
@@ -1,5 +1,5 @@
 public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
-private val myName : T? = null
+private val myName : T?
 private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 public open fun getName() : T? {
@@ -30,8 +30,8 @@ public open class User() {
 class object {
 public open fun main() : Unit {
 var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
+var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
+var i3 : Identifier<*>? = Identifier.init<String?>("name")
 }
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/identifier.kt b/j2k/tests/testData/ast/constructors/file/identifier.kt
index 3ede387654c..c627d0821be 100644
--- a/j2k/tests/testData/ast/constructors/file/identifier.kt
+++ b/j2k/tests/testData/ast/constructors/file/identifier.kt
@@ -1,5 +1,5 @@
 public open class Identifier(_myName : String?, _myHasDollar : Boolean) {
-private val myName : String? = null
+private val myName : String?
 private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 public open fun getName() : String? {
diff --git a/j2k/tests/testData/ast/field/file/valWithInit.kt b/j2k/tests/testData/ast/field/file/valWithInit.kt
index f3c93b7ce6d..b311ebb6784 100644
--- a/j2k/tests/testData/ast/field/file/valWithInit.kt
+++ b/j2k/tests/testData/ast/field/file/valWithInit.kt
@@ -1,3 +1,3 @@
 open class C() {
-val f : Foo? = Foo(1, 2)
+val f : Foo = Foo(1, 2)
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/comp/intNullability.kt b/j2k/tests/testData/ast/file/comp/intNullability.kt
index 891c5720f20..e3e6c4ca889 100644
--- a/j2k/tests/testData/ast/file/comp/intNullability.kt
+++ b/j2k/tests/testData/ast/file/comp/intNullability.kt
@@ -4,6 +4,6 @@ open class Test() {
 open fun test() : Unit {
 var i : Int? = 10
 var j : Int? = 10
-System.out?.println(i + j)
+System.out?.println(i!! + j!!)
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithNullCondition.jav b/j2k/tests/testData/ast/for/statement/forWithNullCondition.jav
similarity index 100%
rename from tests/testData/ast/for/statement/forWithNullCondition.jav
rename to j2k/tests/testData/ast/for/statement/forWithNullCondition.jav
diff --git a/tests/testData/ast/for/statement/forWithNullCondition.kt b/j2k/tests/testData/ast/for/statement/forWithNullCondition.kt
similarity index 100%
rename from tests/testData/ast/for/statement/forWithNullCondition.kt
rename to j2k/tests/testData/ast/for/statement/forWithNullCondition.kt
diff --git a/tests/testData/ast/for/statement/forWithNullInit.jav b/j2k/tests/testData/ast/for/statement/forWithNullInit.jav
similarity index 100%
rename from tests/testData/ast/for/statement/forWithNullInit.jav
rename to j2k/tests/testData/ast/for/statement/forWithNullInit.jav
diff --git a/tests/testData/ast/for/statement/forWithNullInit.kt b/j2k/tests/testData/ast/for/statement/forWithNullInit.kt
similarity index 100%
rename from tests/testData/ast/for/statement/forWithNullInit.kt
rename to j2k/tests/testData/ast/for/statement/forWithNullInit.kt
diff --git a/tests/testData/ast/for/statement/forWithNullUpdate.jav b/j2k/tests/testData/ast/for/statement/forWithNullUpdate.jav
similarity index 100%
rename from tests/testData/ast/for/statement/forWithNullUpdate.jav
rename to j2k/tests/testData/ast/for/statement/forWithNullUpdate.jav
diff --git a/tests/testData/ast/for/statement/forWithNullUpdate.kt b/j2k/tests/testData/ast/for/statement/forWithNullUpdate.kt
similarity index 100%
rename from tests/testData/ast/for/statement/forWithNullUpdate.kt
rename to j2k/tests/testData/ast/for/statement/forWithNullUpdate.kt
diff --git a/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt b/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt
index 5dba2fe4d5d..1cf2e9ebc79 100644
--- a/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt
+++ b/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt
@@ -1 +1 @@
-(c.getType().getName() is String)
\ No newline at end of file
+c.getType().getName() is String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/isOperator/expression/simpleReference.kt b/j2k/tests/testData/ast/isOperator/expression/simpleReference.kt
index 3c65a411cc1..7ccaa0c9744 100644
--- a/j2k/tests/testData/ast/isOperator/expression/simpleReference.kt
+++ b/j2k/tests/testData/ast/isOperator/expression/simpleReference.kt
@@ -1 +1 @@
-(a is String)
\ No newline at end of file
+a is String
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/arrayLength.jav b/j2k/tests/testData/ast/issues/file/arrayLength.jav
similarity index 100%
rename from tests/testData/ast/issues/file/arrayLength.jav
rename to j2k/tests/testData/ast/issues/file/arrayLength.jav
diff --git a/tests/testData/ast/issues/file/arrayLength.kt b/j2k/tests/testData/ast/issues/file/arrayLength.kt
similarity index 100%
rename from tests/testData/ast/issues/file/arrayLength.kt
rename to j2k/tests/testData/ast/issues/file/arrayLength.kt
diff --git a/tests/testData/ast/issues/file/comments.jav b/j2k/tests/testData/ast/issues/file/comments.jav
similarity index 100%
rename from tests/testData/ast/issues/file/comments.jav
rename to j2k/tests/testData/ast/issues/file/comments.jav
diff --git a/tests/testData/ast/issues/file/comments.kt b/j2k/tests/testData/ast/issues/file/comments.kt
similarity index 100%
rename from tests/testData/ast/issues/file/comments.kt
rename to j2k/tests/testData/ast/issues/file/comments.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/file/kt-543-boxed.kt
index 45a39189312..2465167cd1d 100644
--- a/j2k/tests/testData/ast/issues/file/kt-543-boxed.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-543-boxed.kt
@@ -4,8 +4,8 @@ open fun putInt(i : Int?) : Unit {
 }
 open fun test() : Unit {
 var b : Byte = 10
-putInt((b).toInt())
+putInt(b.toInt())
 var b2 : Byte? = 10
-putInt((b2).toInt())
+putInt(b2?.toInt())
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-543.kt b/j2k/tests/testData/ast/issues/file/kt-543.kt
index 6b8e6a38438..dc9dcb3b7f7 100644
--- a/j2k/tests/testData/ast/issues/file/kt-543.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-543.kt
@@ -4,6 +4,6 @@ open fun putInt(i : Int) : Unit {
 }
 open fun test() : Unit {
 var b : Byte = 10
-putInt((b).toInt())
+putInt(b.toInt())
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-638.kt b/j2k/tests/testData/ast/issues/file/kt-638.kt
index 2bdbed1b2d5..6a38806f16a 100644
--- a/j2k/tests/testData/ast/issues/file/kt-638.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-638.kt
@@ -1,5 +1,5 @@
 public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
-private val myName : T? = null
+private val myName : T?
 private var myHasDollar : Boolean = false
 private var myNullable : Boolean = true
 public open fun getName() : T? {
@@ -30,9 +30,9 @@ public open class User() {
 class object {
 public open fun main(args : Array<String?>?) : Unit {
 var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<Any?>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<Any?>? = Identifier.init<String?>("name")
+var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
+var i3 : Identifier<*>? = Identifier.init<String?>("name")
 }
 }
 }
-fun main(args : Array<String?>?) = User.main(args)
\ No newline at end of file
+fun main(args : Array<String>) = User.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-792.kt b/j2k/tests/testData/ast/issues/file/kt-792.kt
index 2e337346e69..2a6929f3456 100644
--- a/j2k/tests/testData/ast/issues/file/kt-792.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-792.kt
@@ -2,6 +2,6 @@ package demo
 open class Test(i : Int) {
 open fun test() : Unit {
 var b : Byte = 10
-Test((b).toInt())
+Test(b.toInt())
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/file/kt-794-mixed.kt
index 4ec128cbf11..769c7a2e2bf 100644
--- a/j2k/tests/testData/ast/issues/file/kt-794-mixed.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-794-mixed.kt
@@ -4,6 +4,6 @@ open fun getInteger(i : Int?) : Int? {
 return i
 }
 open fun test() : Unit {
-var i : Int = getInteger(10)
+var i : Int = getInteger(10)!!
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-809.kt b/j2k/tests/testData/ast/issues/file/kt-809.kt
index d31d733c260..598912b4016 100644
--- a/j2k/tests/testData/ast/issues/file/kt-809.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-809.kt
@@ -13,7 +13,7 @@ open class Test() {
 open fun putInt(i : Int) : Unit {
 }
 open fun test() : Unit {
-putInt((One.myContainer?.myInt)!!)
-IntContainer((One.myContainer?.myInt)!!)
+putInt(One.myContainer?.myInt!!)
+IntContainer(One.myContainer?.myInt!!)
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt
index 488b6b79db6..715092216b6 100644
--- a/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt
@@ -1,9 +1,12 @@
 package test
 import java.io.File
+/**
+* User: ignatov
+*/
 public open class Test() {
 class object {
 public open fun isDir(parent : File?) : Boolean {
-if (parent == null || !parent?.exists())
+if (parent == null || !parent?.exists()!!)
 {
 return false
 }
diff --git a/j2k/tests/testData/ast/issues/file/kt-852.kt b/j2k/tests/testData/ast/issues/file/kt-852.kt
index e6a3cb181f0..1dc37fb5e16 100644
--- a/j2k/tests/testData/ast/issues/file/kt-852.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-852.kt
@@ -4,9 +4,9 @@ open fun test() : String? {
 var s1 : String? = ""
 var s2 : String? = ""
 var s3 : String? = ""
-if ((s1?.isEmpty())!! && (s2?.isEmpty())!!)
+if (s1?.isEmpty()!! && s2?.isEmpty()!!)
 return "OK"
-if ((s1?.isEmpty())!! && (s2?.isEmpty())!! && (s3?.isEmpty())!!)
+if (s1?.isEmpty()!! && s2?.isEmpty()!! && s3?.isEmpty()!!)
 return "OOOK"
 return ""
 }
diff --git a/j2k/tests/testData/ast/issues/file/kt-871.kt b/j2k/tests/testData/ast/issues/file/kt-871.kt
index 69d9bdeef56..6f613625456 100644
--- a/j2k/tests/testData/ast/issues/file/kt-871.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-871.kt
@@ -6,4 +6,4 @@ System.out?.println("Halo!")
 }
 }
 }
-fun main(args : Array<String?>?) = Program.main(args)
\ No newline at end of file
+fun main(args : Array<String>) = Program.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/qualifyStatic.jav b/j2k/tests/testData/ast/issues/file/qualifyStatic.jav
similarity index 100%
rename from tests/testData/ast/issues/file/qualifyStatic.jav
rename to j2k/tests/testData/ast/issues/file/qualifyStatic.jav
diff --git a/tests/testData/ast/issues/file/qualifyStatic.kt b/j2k/tests/testData/ast/issues/file/qualifyStatic.kt
similarity index 100%
rename from tests/testData/ast/issues/file/qualifyStatic.kt
rename to j2k/tests/testData/ast/issues/file/qualifyStatic.kt
diff --git a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
index 244ae7f4495..d42a74320de 100644
--- a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
+++ b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
@@ -1,5 +1,4 @@
 package demo
-import java.util.Iterator
 open class Test() : java.lang.Iterable<String?> {
 public override fun iterator() : java.util.Iterator<String?>? {
 return null
diff --git a/tests/testData/ast/list/file/ForEach.jav b/j2k/tests/testData/ast/list/file/ForEach.jav
similarity index 100%
rename from tests/testData/ast/list/file/ForEach.jav
rename to j2k/tests/testData/ast/list/file/ForEach.jav
diff --git a/tests/testData/ast/list/file/ForEach.kt b/j2k/tests/testData/ast/list/file/ForEach.kt
similarity index 100%
rename from tests/testData/ast/list/file/ForEach.kt
rename to j2k/tests/testData/ast/list/file/ForEach.kt
diff --git a/tests/testData/ast/list/file/Lists.jav b/j2k/tests/testData/ast/list/file/Lists.jav
similarity index 100%
rename from tests/testData/ast/list/file/Lists.jav
rename to j2k/tests/testData/ast/list/file/Lists.jav
diff --git a/tests/testData/ast/list/file/Lists.kt b/j2k/tests/testData/ast/list/file/Lists.kt
similarity index 100%
rename from tests/testData/ast/list/file/Lists.kt
rename to j2k/tests/testData/ast/list/file/Lists.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
index 07d2dfb7204..808085fdf6f 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
+++ b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
@@ -1,7 +1,6 @@
 package test
-import java.util.List
 open class User() {
 open fun main() : Unit {
-var list : List<Any?>? = java.util.LinkedList()
+var list : MutableList<*>? = java.util.LinkedList()
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
index 09e95bef826..808085fdf6f 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
+++ b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
@@ -1,6 +1,6 @@
 package test
 open class User() {
 open fun main() : Unit {
-var list : java.util.List<Any?>? = java.util.LinkedList()
+var list : MutableList<*>? = java.util.LinkedList()
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt b/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
index b0fd39e1c57..d110bb30c16 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
+++ b/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
@@ -1,7 +1,6 @@
-import java.util.List
 import java.util.LinkedList
 open class User() {
 open fun main() : Unit {
-var list : List<String?>? = LinkedList<String?>()
+var list : MutableList<String?>? = LinkedList<String?>()
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
index 089a1acef21..1f5699c575d 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
+++ b/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
@@ -1,11 +1,10 @@
 package org.test
-import java.util.List
 import java.util.LinkedList
 open class Member() {
 }
 open class User() {
 open fun main() : Unit {
-var members : List<Member?>? = LinkedList<Member?>()
+var members : MutableList<Member?>? = LinkedList<Member?>()
 members?.add(Member())
 }
 }
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/nullableIf.jav b/j2k/tests/testData/ast/prefixOperator/statement/nullableIf.jav
similarity index 100%
rename from tests/testData/ast/prefixOperator/statement/nullableIf.jav
rename to j2k/tests/testData/ast/prefixOperator/statement/nullableIf.jav
diff --git a/tests/testData/ast/prefixOperator/statement/nullableIf.kt b/j2k/tests/testData/ast/prefixOperator/statement/nullableIf.kt
similarity index 100%
rename from tests/testData/ast/prefixOperator/statement/nullableIf.kt
rename to j2k/tests/testData/ast/prefixOperator/statement/nullableIf.kt
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
index 976f317b913..426b2190bc9 100644
--- a/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
+++ b/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
@@ -6,8 +6,8 @@ System.out?.println(e)
 }
 open class Test() {
 open fun main() : Unit {
-var raw1 : Collection<Any?>? = Collection(1)
-var raw2 : Collection<Any?>? = Collection<Int?>(1)
-var raw3 : Collection<Any?>? = Collection<String?>("1")
+var raw1 : Collection<*>? = Collection(1)
+var raw2 : Collection<*>? = Collection<Int?>(1)
+var raw3 : Collection<*>? = Collection<String?>("1")
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540.kt b/j2k/tests/testData/ast/rawGenerics/file/kt-540.kt
index dd3f0d27c4c..428297a628a 100644
--- a/j2k/tests/testData/ast/rawGenerics/file/kt-540.kt
+++ b/j2k/tests/testData/ast/rawGenerics/file/kt-540.kt
@@ -1,10 +1,9 @@
 package demo
-import java.util.List
 import java.util.LinkedList
 open class Test() {
 open fun main() : Unit {
-var common : List<String?>? = LinkedList<String?>()
-var raw : List<Any?>? = LinkedList<String?>()
-var superRaw : List<Any?>? = LinkedList()
+var common : MutableList<String?>? = LinkedList<String?>()
+var raw : MutableList<*>? = LinkedList<String?>()
+var superRaw : MutableList<*>? = LinkedList()
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt
index 60f4dd0466e..ff998f92dc2 100644
--- a/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt
+++ b/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt
@@ -85,4 +85,4 @@ for (i in 1..12) test(i)
 }
 }
 }
-fun main(args : Array<String?>?) = SwitchDemo.main(args)
\ No newline at end of file
+fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/emptySwitch.jav b/j2k/tests/testData/ast/switch/file/emptySwitch.jav
similarity index 100%
rename from tests/testData/ast/switch/file/emptySwitch.jav
rename to j2k/tests/testData/ast/switch/file/emptySwitch.jav
diff --git a/tests/testData/ast/switch/file/emptySwitch.kt b/j2k/tests/testData/ast/switch/file/emptySwitch.kt
similarity index 100%
rename from tests/testData/ast/switch/file/emptySwitch.kt
rename to j2k/tests/testData/ast/switch/file/emptySwitch.kt
diff --git a/j2k/tests/testData/ast/switch/file/fallDown.kt b/j2k/tests/testData/ast/switch/file/fallDown.kt
index e27df742d64..35bb7e7576d 100644
--- a/j2k/tests/testData/ast/switch/file/fallDown.kt
+++ b/j2k/tests/testData/ast/switch/file/fallDown.kt
@@ -16,4 +16,4 @@ System.out?.println(monthString)
 }
 }
 }
-fun main(args : Array<String?>?) = SwitchDemo.main(args)
\ No newline at end of file
+fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/switch/file/kt-539.kt b/j2k/tests/testData/ast/switch/file/kt-539.kt
index aa9105769d8..4413070760e 100644
--- a/j2k/tests/testData/ast/switch/file/kt-539.kt
+++ b/j2k/tests/testData/ast/switch/file/kt-539.kt
@@ -49,4 +49,4 @@ System.out?.println(monthString)
 }
 }
 }
-fun main(args : Array<String?>?) = SwitchDemo.main(args)
\ No newline at end of file
+fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/nondefault.jav b/j2k/tests/testData/ast/switch/file/nondefault.jav
similarity index 100%
rename from tests/testData/ast/switch/file/nondefault.jav
rename to j2k/tests/testData/ast/switch/file/nondefault.jav
diff --git a/tests/testData/ast/switch/file/nondefault.kt b/j2k/tests/testData/ast/switch/file/nondefault.kt
similarity index 100%
rename from tests/testData/ast/switch/file/nondefault.kt
rename to j2k/tests/testData/ast/switch/file/nondefault.kt
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithFields.kt b/j2k/tests/testData/ast/trait/class/interfaceWithFields.kt
index 008928c5d7c..f8fdfeacaf4 100644
--- a/j2k/tests/testData/ast/trait/class/interfaceWithFields.kt
+++ b/j2k/tests/testData/ast/trait/class/interfaceWithFields.kt
@@ -1,7 +1,7 @@
 trait INode {
 class object {
-val IN : String? = "in"
-val AT : String? = "@"
+val IN : String = "in"
+val AT : String = "@"
 val COMMA_WITH_SPACE : String? = COMMA + SPACE
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt b/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt
index b7b74d0ed87..0f1ab7c26f1 100644
--- a/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt
+++ b/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt
@@ -1,7 +1,7 @@
 public trait INode {
 class object {
-public val IN : String? = "in"
-public val AT : String? = "@"
+public val IN : String = "in"
+public val AT : String = "@"
 public val COMMA_WITH_SPACE : String? = COMMA + SPACE
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt b/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
index 8ff1a9a7da8..ce5da7da296 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
+++ b/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
@@ -2,10 +2,10 @@ try
 {
 callMethod(params)
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
index cb84316d7a2..40e83f0667f 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
+++ b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
@@ -1,10 +1,10 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
index 9cef76b4596..92e60f280d4 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
+++ b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
@@ -1,10 +1,10 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
 finally
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
index 47bd997f98a..2f5deb07c0b 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
+++ b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
@@ -1,9 +1,9 @@
 try
 {
 }
-catch (e : Exception?) {
+catch (e : Exception) {
 println(1)
 }
-catch (e : IOException?) {
+catch (e : IOException) {
 println(0)
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt b/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt
index ad9dd5d2a7b..e312f02e742 100644
--- a/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt
+++ b/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt
@@ -1 +1 @@
-(100.00 as Int)
\ No newline at end of file
+100.00.toInt()
\ No newline at end of file
diff --git a/tests/testData/ast/annotations/file/jetbrainsNotNull.jav b/tests/testData/ast/annotations/file/jetbrainsNotNull.jav
deleted file mode 100644
index 92c511d88a0..00000000000
--- a/tests/testData/ast/annotations/file/jetbrainsNotNull.jav
+++ /dev/null
@@ -1,29 +0,0 @@
-package test;
-
-import org.jetbrains.annotations.NotNull;
-
-public class Test {
-  @NotNull String myStr = "String2";
-
-  public Test(@NotNull String str) {
-    myStr = str;
-  }
-
-  public void sout(@NotNull String str) {
-    System.out.println(str);
-  }
-
-  @NotNull
-  public String dummy(@NotNull String str) {
-    return str;
-  }
-
-  public void test() {
-    sout("String");
-    @NotNull String test = "String2";
-    sout(test);
-    sout(dummy(test));
-
-    new Test(test);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/annotations/file/jetbrainsNotNull.kt b/tests/testData/ast/annotations/file/jetbrainsNotNull.kt
deleted file mode 100644
index 1639842a602..00000000000
--- a/tests/testData/ast/annotations/file/jetbrainsNotNull.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-public open class Test(str : String) {
-var myStr : String = "String2"
-public open fun sout(str : String) : Unit {
-System.out?.println(str)
-}
-public open fun dummy(str : String) : String {
-return str
-}
-public open fun test() : Unit {
-sout("String")
-var test : String = "String2"
-sout(test)
-sout(dummy(test))
-Test(test)
-}
-{
-myStr = str
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.jav b/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.jav
deleted file mode 100644
index c8d50704ff8..00000000000
--- a/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.jav
+++ /dev/null
@@ -1,22 +0,0 @@
-package test;
-
-import org.jetbrains.annotations.NotNull;
-
-class Foo {
-   void execute() {}
-}
-
-class Bar {
-  @NotNull
-  Foo fooNotNull = Foo();
-  Foo fooNullable = null;
-}
-
-class Test {
-  public void test(@NotNull Bar barNotNull, Bar barNullable) {
-    barNotNull.fooNotNull.execute();
-    barNotNull.fooNullable.execute();
-    barNullable.fooNotNull.execute();
-    barNullable.fooNullable.execute();
-  }
-}
diff --git a/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.kt b/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.kt
deleted file mode 100644
index 8f43666f096..00000000000
--- a/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package test
-open class Foo() {
-open fun execute() : Unit {
-}
-}
-open class Bar() {
-var fooNotNull : Foo = Foo()
-var fooNullable : Foo? = null
-}
-open class Test() {
-public open fun test(barNotNull : Bar, barNullable : Bar?) : Unit {
-barNotNull.fooNotNull.execute()
-barNotNull.fooNullable?.execute()
-barNullable?.fooNotNull?.execute()
-barNullable?.fooNullable?.execute()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav b/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav
deleted file mode 100644
index fba735a5ff0..00000000000
--- a/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-class Test {
-  String str;
-  {
-     str = "Ola";
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/anonymousBlock/file/oneAnonBlock.kt b/tests/testData/ast/anonymousBlock/file/oneAnonBlock.kt
deleted file mode 100644
index bf84ae34578..00000000000
--- a/tests/testData/ast/anonymousBlock/file/oneAnonBlock.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-open class Test() {
-var str : String? = null
-{
-str = "Ola"
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav b/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav
deleted file mode 100644
index c86774f1642..00000000000
--- a/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-class Test {
-  String str;
-  static {
-     str = "Ola";
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt b/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt
deleted file mode 100644
index 5c8649fbcf0..00000000000
--- a/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-open class Test() {
-var str : String? = null
-class object {
-{
-str = "Ola"
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.jav b/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.jav
deleted file mode 100644
index 7a99230c2f6..00000000000
--- a/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.jav
+++ /dev/null
@@ -1 +0,0 @@
-myArray[myLibrary.calculateIndex(100)]
\ No newline at end of file
diff --git a/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.kt b/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.kt
deleted file mode 100644
index 7a99230c2f6..00000000000
--- a/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.kt
+++ /dev/null
@@ -1 +0,0 @@
-myArray[myLibrary.calculateIndex(100)]
\ No newline at end of file
diff --git a/tests/testData/ast/arrayAccessExpression/expression/intIndex.jav b/tests/testData/ast/arrayAccessExpression/expression/intIndex.jav
deleted file mode 100644
index 8a7de5e4e73..00000000000
--- a/tests/testData/ast/arrayAccessExpression/expression/intIndex.jav
+++ /dev/null
@@ -1 +0,0 @@
-myArray[10]
\ No newline at end of file
diff --git a/tests/testData/ast/arrayAccessExpression/expression/intIndex.kt b/tests/testData/ast/arrayAccessExpression/expression/intIndex.kt
deleted file mode 100644
index 8a7de5e4e73..00000000000
--- a/tests/testData/ast/arrayAccessExpression/expression/intIndex.kt
+++ /dev/null
@@ -1 +0,0 @@
-myArray[10]
\ No newline at end of file
diff --git a/tests/testData/ast/arrayAccessExpression/expression/variableIndex.jav b/tests/testData/ast/arrayAccessExpression/expression/variableIndex.jav
deleted file mode 100644
index 2a40dae7f3b..00000000000
--- a/tests/testData/ast/arrayAccessExpression/expression/variableIndex.jav
+++ /dev/null
@@ -1 +0,0 @@
-myArray[i]
\ No newline at end of file
diff --git a/tests/testData/ast/arrayAccessExpression/expression/variableIndex.kt b/tests/testData/ast/arrayAccessExpression/expression/variableIndex.kt
deleted file mode 100644
index 2a40dae7f3b..00000000000
--- a/tests/testData/ast/arrayAccessExpression/expression/variableIndex.kt
+++ /dev/null
@@ -1 +0,0 @@
-myArray[i]
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav b/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav
deleted file mode 100644
index 0d3fb727286..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav
+++ /dev/null
@@ -1 +0,0 @@
-new int[] {1, 2, 3};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/expression/newInt.kt b/tests/testData/ast/arrayInitializerExpression/expression/newInt.kt
deleted file mode 100644
index 6cfae9942ea..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/expression/newInt.kt
+++ /dev/null
@@ -1 +0,0 @@
-intArray(1, 2, 3)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav b/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav
deleted file mode 100644
index 44f26cb4a79..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-double[] a = new double[]{1.0, 2, 3}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.kt b/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.kt
deleted file mode 100644
index c2d0ab03352..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : DoubleArray? = doubleArray(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav b/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav
deleted file mode 100644
index 58d0ca95d05..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-double a = 0, b = 0, c = 0;
-double ds[] = {a, b, c};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt b/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt
deleted file mode 100644
index 2ccb8da60c1..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-var a : Double = 0
-var b : Double = 0
-var c : Double = 0
-var ds : DoubleArray? = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav b/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav
deleted file mode 100644
index 36d2afa3425..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-float[] a = new float[]{1, 2, 3.0}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/floatArray.kt b/tests/testData/ast/arrayInitializerExpression/statement/floatArray.kt
deleted file mode 100644
index b824bd21e48..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/floatArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : FloatArray? = floatArray(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav b/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav
deleted file mode 100644
index 3ebd4af38bd..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-java.lang.Double[] a = new java.lang.Double[]{1, 2, 3};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt b/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt
deleted file mode 100644
index c3a5bb91fd6..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : Array<java.lang.Double?>? = array<java.lang.Double?>(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav b/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav
deleted file mode 100644
index b53b4dc9aec..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-java.lang.Float[] a = new java.lang.Float[]{1, 2, 3};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt b/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt
deleted file mode 100644
index d31d26a7c74..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : Array<java.lang.Float?>? = array<java.lang.Float?>(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav b/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav
deleted file mode 100644
index 5a6e85cdfe1..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav
+++ /dev/null
@@ -1 +0,0 @@
-byte[] a = new byte[] {1, 2, 3};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/newByte.kt b/tests/testData/ast/arrayInitializerExpression/statement/newByte.kt
deleted file mode 100644
index 2f0ce90f341..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/newByte.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : ByteArray? = byteArray(1, 2, 3)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav b/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav
deleted file mode 100644
index 9e498af66a6..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav
+++ /dev/null
@@ -1 +0,0 @@
-int[] a = {1, 2, 3};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/oneDim.kt b/tests/testData/ast/arrayInitializerExpression/statement/oneDim.kt
deleted file mode 100644
index 19b3af3f5c4..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/oneDim.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : IntArray? = intArray(1, 2, 3)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav b/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav
deleted file mode 100644
index 185a7d5aaf8..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-int a = 0, b = 0, c = 0;
-int is[] = {a, b, c};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt b/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt
deleted file mode 100644
index a1b91cfa3ab..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-var a : Int = 0
-var b : Int = 0
-var c : Int = 0
-var `is` : IntArray? = intArray(a, b, c)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav b/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav
deleted file mode 100644
index f895393aad5..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav
+++ /dev/null
@@ -1 +0,0 @@
-int[][] a = { {1, 2, 3}, {4, 5, 6}, {7, 8, 9} };
\ No newline at end of file
diff --git a/tests/testData/ast/arrayInitializerExpression/statement/twoDim.kt b/tests/testData/ast/arrayInitializerExpression/statement/twoDim.kt
deleted file mode 100644
index 4ccc886bd71..00000000000
--- a/tests/testData/ast/arrayInitializerExpression/statement/twoDim.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : Array<IntArray?>? = array<IntArray?>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/method/methodArrayArgs.jav b/tests/testData/ast/arrayType/method/methodArrayArgs.jav
deleted file mode 100644
index c5c5768faf4..00000000000
--- a/tests/testData/ast/arrayType/method/methodArrayArgs.jav
+++ /dev/null
@@ -1 +0,0 @@
-void fromArrayToCollection(Foo[] a) {}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/method/methodArrayArgs.kt b/tests/testData/ast/arrayType/method/methodArrayArgs.kt
deleted file mode 100644
index b095e2dd099..00000000000
--- a/tests/testData/ast/arrayType/method/methodArrayArgs.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun fromArrayToCollection(a : Array<Foo?>?) : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav b/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav
deleted file mode 100644
index 781bcb6a731..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav
+++ /dev/null
@@ -1 +0,0 @@
-int [][] d2 = new int[][]{};
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatement.kt b/tests/testData/ast/arrayType/statement/arrayInitializationStatement.kt
deleted file mode 100644
index 146484f79d7..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatement.kt
+++ /dev/null
@@ -1 +0,0 @@
-var d2 : Array<IntArray?>? = array<IntArray?>()
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav b/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav
deleted file mode 100644
index 01c957d5dfe..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav
+++ /dev/null
@@ -1 +0,0 @@
-int [][] d2 = new int[5][];
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt b/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt
deleted file mode 100644
index a55da469576..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt
+++ /dev/null
@@ -1 +0,0 @@
-var d2 : Array<IntArray?>? = arrayOfNulls<IntArray?>(5)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav b/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav
deleted file mode 100644
index abe20f1ec57..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav
+++ /dev/null
@@ -1 +0,0 @@
-int [][][] d3 = new int[5][5][];
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt b/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt
deleted file mode 100644
index 76a8da1a13f..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt
+++ /dev/null
@@ -1 +0,0 @@
-var d3 : Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, {arrayOfNulls<IntArray?>(5)})
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav b/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav
deleted file mode 100644
index fe4a268f124..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav
+++ /dev/null
@@ -1 +0,0 @@
-int [][] d2 = new int[5][5];
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt b/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt
deleted file mode 100644
index 32ac4491c66..00000000000
--- a/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt
+++ /dev/null
@@ -1 +0,0 @@
-var d2 : Array<IntArray?>? = Array<IntArray?>(5, {IntArray(5)})
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav b/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav
deleted file mode 100644
index d49028c3fe0..00000000000
--- a/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-String [][] ss = new String[5][5];
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt b/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt
deleted file mode 100644
index ada23e19294..00000000000
--- a/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav b/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav
deleted file mode 100644
index 498743daff6..00000000000
--- a/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-String [][][] sss = new String[5][5][5];
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt b/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt
deleted file mode 100644
index 2657bcc524c..00000000000
--- a/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var sss : Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, {Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})})
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/longArray.jav b/tests/testData/ast/arrayType/statement/longArray.jav
deleted file mode 100644
index 8ba3eb35a5c..00000000000
--- a/tests/testData/ast/arrayType/statement/longArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-long[] a = new long[]{1, 2, 3}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/longArray.kt b/tests/testData/ast/arrayType/statement/longArray.kt
deleted file mode 100644
index 25e13c35f13..00000000000
--- a/tests/testData/ast/arrayType/statement/longArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : LongArray? = longArray(1, 2, 3)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/newIntArray.jav b/tests/testData/ast/arrayType/statement/newIntArray.jav
deleted file mode 100644
index 8c66b71c91f..00000000000
--- a/tests/testData/ast/arrayType/statement/newIntArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-int[] a = new int[]{1, 2, 3}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/newIntArray.kt b/tests/testData/ast/arrayType/statement/newIntArray.kt
deleted file mode 100644
index 19b3af3f5c4..00000000000
--- a/tests/testData/ast/arrayType/statement/newIntArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : IntArray? = intArray(1, 2, 3)
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/newStringArray.jav b/tests/testData/ast/arrayType/statement/newStringArray.jav
deleted file mode 100644
index 371c13bfa2d..00000000000
--- a/tests/testData/ast/arrayType/statement/newStringArray.jav
+++ /dev/null
@@ -1 +0,0 @@
-String[] a = new String[]{"abc"}
\ No newline at end of file
diff --git a/tests/testData/ast/arrayType/statement/newStringArray.kt b/tests/testData/ast/arrayType/statement/newStringArray.kt
deleted file mode 100644
index 8e2ed9e854c..00000000000
--- a/tests/testData/ast/arrayType/statement/newStringArray.kt
+++ /dev/null
@@ -1 +0,0 @@
-var a : Array<String?>? = array<String?>("abc")
\ No newline at end of file
diff --git a/tests/testData/ast/assertStatement/statement/onlyCondition.jav b/tests/testData/ast/assertStatement/statement/onlyCondition.jav
deleted file mode 100644
index 7ac44744fe6..00000000000
--- a/tests/testData/ast/assertStatement/statement/onlyCondition.jav
+++ /dev/null
@@ -1 +0,0 @@
-assert boolMethod();
\ No newline at end of file
diff --git a/tests/testData/ast/assertStatement/statement/onlyCondition.kt b/tests/testData/ast/assertStatement/statement/onlyCondition.kt
deleted file mode 100644
index e148b562e0c..00000000000
--- a/tests/testData/ast/assertStatement/statement/onlyCondition.kt
+++ /dev/null
@@ -1 +0,0 @@
-assert {boolMethod()}
\ No newline at end of file
diff --git a/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav b/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav
deleted file mode 100644
index b1c738d82a9..00000000000
--- a/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav
+++ /dev/null
@@ -1 +0,0 @@
-assert(boolMethod());
\ No newline at end of file
diff --git a/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt b/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt
deleted file mode 100644
index dda5f1e1170..00000000000
--- a/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt
+++ /dev/null
@@ -1 +0,0 @@
-assert {(boolMethod())}
\ No newline at end of file
diff --git a/tests/testData/ast/assertStatement/statement/withStringDetail.jav b/tests/testData/ast/assertStatement/statement/withStringDetail.jav
deleted file mode 100644
index aad7600e036..00000000000
--- a/tests/testData/ast/assertStatement/statement/withStringDetail.jav
+++ /dev/null
@@ -1 +0,0 @@
-assert true : "string details";
\ No newline at end of file
diff --git a/tests/testData/ast/assertStatement/statement/withStringDetail.kt b/tests/testData/ast/assertStatement/statement/withStringDetail.kt
deleted file mode 100644
index 9fa45aa19e7..00000000000
--- a/tests/testData/ast/assertStatement/statement/withStringDetail.kt
+++ /dev/null
@@ -1 +0,0 @@
-assert("string details") {true}
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/and.jav b/tests/testData/ast/assignmentExpression/expression/and.jav
deleted file mode 100644
index d345703fc8e..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/and.jav
+++ /dev/null
@@ -1 +0,0 @@
-x &= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/and.kt b/tests/testData/ast/assignmentExpression/expression/and.kt
deleted file mode 100644
index dc3b47760da..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/and.kt
+++ /dev/null
@@ -1 +0,0 @@
-x = x and 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/assignment.jav b/tests/testData/ast/assignmentExpression/expression/assignment.jav
deleted file mode 100644
index 1ddfb7dc8e4..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/assignment.jav
+++ /dev/null
@@ -1 +0,0 @@
-x = 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/assignment.kt b/tests/testData/ast/assignmentExpression/expression/assignment.kt
deleted file mode 100644
index 1ddfb7dc8e4..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/assignment.kt
+++ /dev/null
@@ -1 +0,0 @@
-x = 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/divideAssign.jav b/tests/testData/ast/assignmentExpression/expression/divideAssign.jav
deleted file mode 100644
index e63372a6277..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/divideAssign.jav
+++ /dev/null
@@ -1 +0,0 @@
-x /= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/divideAssign.kt b/tests/testData/ast/assignmentExpression/expression/divideAssign.kt
deleted file mode 100644
index e63372a6277..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/divideAssign.kt
+++ /dev/null
@@ -1 +0,0 @@
-x /= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/minusAssign.jav b/tests/testData/ast/assignmentExpression/expression/minusAssign.jav
deleted file mode 100644
index 58f87ee4a6c..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/minusAssign.jav
+++ /dev/null
@@ -1 +0,0 @@
-x -= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/minusAssign.kt b/tests/testData/ast/assignmentExpression/expression/minusAssign.kt
deleted file mode 100644
index 58f87ee4a6c..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/minusAssign.kt
+++ /dev/null
@@ -1 +0,0 @@
-x -= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/multiplyAssign.jav b/tests/testData/ast/assignmentExpression/expression/multiplyAssign.jav
deleted file mode 100644
index ddea70541b0..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/multiplyAssign.jav
+++ /dev/null
@@ -1 +0,0 @@
-x *= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/multiplyAssign.kt b/tests/testData/ast/assignmentExpression/expression/multiplyAssign.kt
deleted file mode 100644
index ddea70541b0..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/multiplyAssign.kt
+++ /dev/null
@@ -1 +0,0 @@
-x *= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/or.jav b/tests/testData/ast/assignmentExpression/expression/or.jav
deleted file mode 100644
index 07b425b9cc5..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/or.jav
+++ /dev/null
@@ -1 +0,0 @@
-x |= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/or.kt b/tests/testData/ast/assignmentExpression/expression/or.kt
deleted file mode 100644
index 776a84a8989..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/or.kt
+++ /dev/null
@@ -1 +0,0 @@
-x = x or 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/plusAssign.jav b/tests/testData/ast/assignmentExpression/expression/plusAssign.jav
deleted file mode 100644
index 2448227cb69..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/plusAssign.jav
+++ /dev/null
@@ -1 +0,0 @@
-x += 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/plusAssign.kt b/tests/testData/ast/assignmentExpression/expression/plusAssign.kt
deleted file mode 100644
index 2448227cb69..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/plusAssign.kt
+++ /dev/null
@@ -1 +0,0 @@
-x += 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/reminder.jav b/tests/testData/ast/assignmentExpression/expression/reminder.jav
deleted file mode 100644
index b6fe73d0db1..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/reminder.jav
+++ /dev/null
@@ -1 +0,0 @@
-x %= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/reminder.kt b/tests/testData/ast/assignmentExpression/expression/reminder.kt
deleted file mode 100644
index b6fe73d0db1..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/reminder.kt
+++ /dev/null
@@ -1 +0,0 @@
-x %= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav b/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav
deleted file mode 100644
index 1b5eb34ba7e..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav
+++ /dev/null
@@ -1 +0,0 @@
-x <<= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/shiftLeft.kt b/tests/testData/ast/assignmentExpression/expression/shiftLeft.kt
deleted file mode 100644
index bc26f965e4d..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/shiftLeft.kt
+++ /dev/null
@@ -1 +0,0 @@
-x = x shl 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/shiftRight.jav b/tests/testData/ast/assignmentExpression/expression/shiftRight.jav
deleted file mode 100644
index ac7c546b4cb..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/shiftRight.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >>= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/shiftRight.kt b/tests/testData/ast/assignmentExpression/expression/shiftRight.kt
deleted file mode 100644
index a731104d2f6..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/shiftRight.kt
+++ /dev/null
@@ -1 +0,0 @@
-x = x shr 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav b/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav
deleted file mode 100644
index 80750c37495..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >>>= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.kt b/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.kt
deleted file mode 100644
index 2450029bd56..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.kt
+++ /dev/null
@@ -1 +0,0 @@
-x = x ushr 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/xor.jav b/tests/testData/ast/assignmentExpression/expression/xor.jav
deleted file mode 100644
index 2f6e418eb5d..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/xor.jav
+++ /dev/null
@@ -1 +0,0 @@
-x ^= 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/expression/xor.kt b/tests/testData/ast/assignmentExpression/expression/xor.kt
deleted file mode 100644
index 381ed467f3d..00000000000
--- a/tests/testData/ast/assignmentExpression/expression/xor.kt
+++ /dev/null
@@ -1 +0,0 @@
-x = x xor 2
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav b/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav
deleted file mode 100644
index 5cb450aa538..00000000000
--- a/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav
+++ /dev/null
@@ -1 +0,0 @@
-i = 1;
\ No newline at end of file
diff --git a/tests/testData/ast/assignmentExpression/statement/simpleAssignment.kt b/tests/testData/ast/assignmentExpression/statement/simpleAssignment.kt
deleted file mode 100644
index 88de072edc6..00000000000
--- a/tests/testData/ast/assignmentExpression/statement/simpleAssignment.kt
+++ /dev/null
@@ -1 +0,0 @@
-i = 1
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/and.jav b/tests/testData/ast/binaryExpression/expression/and.jav
deleted file mode 100644
index 8c519f1a5d3..00000000000
--- a/tests/testData/ast/binaryExpression/expression/and.jav
+++ /dev/null
@@ -1 +0,0 @@
-x & 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/and.kt b/tests/testData/ast/binaryExpression/expression/and.kt
deleted file mode 100644
index cbf463b36ea..00000000000
--- a/tests/testData/ast/binaryExpression/expression/and.kt
+++ /dev/null
@@ -1 +0,0 @@
-x and 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/conditionalAnd.jav b/tests/testData/ast/binaryExpression/expression/conditionalAnd.jav
deleted file mode 100644
index 5aa60340840..00000000000
--- a/tests/testData/ast/binaryExpression/expression/conditionalAnd.jav
+++ /dev/null
@@ -1 +0,0 @@
-true && false
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/conditionalAnd.kt b/tests/testData/ast/binaryExpression/expression/conditionalAnd.kt
deleted file mode 100644
index 5aa60340840..00000000000
--- a/tests/testData/ast/binaryExpression/expression/conditionalAnd.kt
+++ /dev/null
@@ -1 +0,0 @@
-true && false
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/conditionalOr.jav b/tests/testData/ast/binaryExpression/expression/conditionalOr.jav
deleted file mode 100644
index 64634c472bc..00000000000
--- a/tests/testData/ast/binaryExpression/expression/conditionalOr.jav
+++ /dev/null
@@ -1 +0,0 @@
-true || false
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/conditionalOr.kt b/tests/testData/ast/binaryExpression/expression/conditionalOr.kt
deleted file mode 100644
index 64634c472bc..00000000000
--- a/tests/testData/ast/binaryExpression/expression/conditionalOr.kt
+++ /dev/null
@@ -1 +0,0 @@
-true || false
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/divide.jav b/tests/testData/ast/binaryExpression/expression/divide.jav
deleted file mode 100644
index 0e0b5d58618..00000000000
--- a/tests/testData/ast/binaryExpression/expression/divide.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 / 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/divide.kt b/tests/testData/ast/binaryExpression/expression/divide.kt
deleted file mode 100644
index 0e0b5d58618..00000000000
--- a/tests/testData/ast/binaryExpression/expression/divide.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 / 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/greaterThan.jav b/tests/testData/ast/binaryExpression/expression/greaterThan.jav
deleted file mode 100644
index 2774817e788..00000000000
--- a/tests/testData/ast/binaryExpression/expression/greaterThan.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 > 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/greaterThan.kt b/tests/testData/ast/binaryExpression/expression/greaterThan.kt
deleted file mode 100644
index 2774817e788..00000000000
--- a/tests/testData/ast/binaryExpression/expression/greaterThan.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 > 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/greaterThanEqual.jav b/tests/testData/ast/binaryExpression/expression/greaterThanEqual.jav
deleted file mode 100644
index 6993045c7a2..00000000000
--- a/tests/testData/ast/binaryExpression/expression/greaterThanEqual.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 >= 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/greaterThanEqual.kt b/tests/testData/ast/binaryExpression/expression/greaterThanEqual.kt
deleted file mode 100644
index 6993045c7a2..00000000000
--- a/tests/testData/ast/binaryExpression/expression/greaterThanEqual.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 >= 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/lessThan.jav b/tests/testData/ast/binaryExpression/expression/lessThan.jav
deleted file mode 100644
index 535e996ad9b..00000000000
--- a/tests/testData/ast/binaryExpression/expression/lessThan.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 < 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/lessThan.kt b/tests/testData/ast/binaryExpression/expression/lessThan.kt
deleted file mode 100644
index 535e996ad9b..00000000000
--- a/tests/testData/ast/binaryExpression/expression/lessThan.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 < 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/lessThanEqual.jav b/tests/testData/ast/binaryExpression/expression/lessThanEqual.jav
deleted file mode 100644
index 5e9475f92bf..00000000000
--- a/tests/testData/ast/binaryExpression/expression/lessThanEqual.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 <= 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/lessThanEqual.kt b/tests/testData/ast/binaryExpression/expression/lessThanEqual.kt
deleted file mode 100644
index 5e9475f92bf..00000000000
--- a/tests/testData/ast/binaryExpression/expression/lessThanEqual.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 <= 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/minus.jav b/tests/testData/ast/binaryExpression/expression/minus.jav
deleted file mode 100644
index 7ec0a893aef..00000000000
--- a/tests/testData/ast/binaryExpression/expression/minus.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 - 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/minus.kt b/tests/testData/ast/binaryExpression/expression/minus.kt
deleted file mode 100644
index 7ec0a893aef..00000000000
--- a/tests/testData/ast/binaryExpression/expression/minus.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 - 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/multiply.jav b/tests/testData/ast/binaryExpression/expression/multiply.jav
deleted file mode 100644
index a48dfec9fa5..00000000000
--- a/tests/testData/ast/binaryExpression/expression/multiply.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 * 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/multiply.kt b/tests/testData/ast/binaryExpression/expression/multiply.kt
deleted file mode 100644
index a48dfec9fa5..00000000000
--- a/tests/testData/ast/binaryExpression/expression/multiply.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 * 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/or.jav b/tests/testData/ast/binaryExpression/expression/or.jav
deleted file mode 100644
index 27e32efa3d5..00000000000
--- a/tests/testData/ast/binaryExpression/expression/or.jav
+++ /dev/null
@@ -1 +0,0 @@
-x | 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/or.kt b/tests/testData/ast/binaryExpression/expression/or.kt
deleted file mode 100644
index ccad705935d..00000000000
--- a/tests/testData/ast/binaryExpression/expression/or.kt
+++ /dev/null
@@ -1 +0,0 @@
-x or 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/plus.jav b/tests/testData/ast/binaryExpression/expression/plus.jav
deleted file mode 100644
index 193df0b550b..00000000000
--- a/tests/testData/ast/binaryExpression/expression/plus.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 + 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/plus.kt b/tests/testData/ast/binaryExpression/expression/plus.kt
deleted file mode 100644
index 193df0b550b..00000000000
--- a/tests/testData/ast/binaryExpression/expression/plus.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 + 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/remainder.jav b/tests/testData/ast/binaryExpression/expression/remainder.jav
deleted file mode 100644
index 049211394d2..00000000000
--- a/tests/testData/ast/binaryExpression/expression/remainder.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 % 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/remainder.kt b/tests/testData/ast/binaryExpression/expression/remainder.kt
deleted file mode 100644
index 049211394d2..00000000000
--- a/tests/testData/ast/binaryExpression/expression/remainder.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 % 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/shiftLeft.jav b/tests/testData/ast/binaryExpression/expression/shiftLeft.jav
deleted file mode 100644
index 0fc7ee16109..00000000000
--- a/tests/testData/ast/binaryExpression/expression/shiftLeft.jav
+++ /dev/null
@@ -1 +0,0 @@
-x << 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/shiftLeft.kt b/tests/testData/ast/binaryExpression/expression/shiftLeft.kt
deleted file mode 100644
index face9a53255..00000000000
--- a/tests/testData/ast/binaryExpression/expression/shiftLeft.kt
+++ /dev/null
@@ -1 +0,0 @@
-x shl 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/shiftRight.jav b/tests/testData/ast/binaryExpression/expression/shiftRight.jav
deleted file mode 100644
index 452d459f0be..00000000000
--- a/tests/testData/ast/binaryExpression/expression/shiftRight.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >> 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/shiftRight.kt b/tests/testData/ast/binaryExpression/expression/shiftRight.kt
deleted file mode 100644
index 771795abe88..00000000000
--- a/tests/testData/ast/binaryExpression/expression/shiftRight.kt
+++ /dev/null
@@ -1 +0,0 @@
-x shr 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav b/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav
deleted file mode 100644
index 43c9914d750..00000000000
--- a/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >>> 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/unsignedRightShift.kt b/tests/testData/ast/binaryExpression/expression/unsignedRightShift.kt
deleted file mode 100644
index 8b8c1f89e58..00000000000
--- a/tests/testData/ast/binaryExpression/expression/unsignedRightShift.kt
+++ /dev/null
@@ -1 +0,0 @@
-x.ushr(2)
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/xor.jav b/tests/testData/ast/binaryExpression/expression/xor.jav
deleted file mode 100644
index 09b544bdf1e..00000000000
--- a/tests/testData/ast/binaryExpression/expression/xor.jav
+++ /dev/null
@@ -1 +0,0 @@
-x ^ 2
\ No newline at end of file
diff --git a/tests/testData/ast/binaryExpression/expression/xor.kt b/tests/testData/ast/binaryExpression/expression/xor.kt
deleted file mode 100644
index b8ad1650a31..00000000000
--- a/tests/testData/ast/binaryExpression/expression/xor.kt
+++ /dev/null
@@ -1 +0,0 @@
-x xor 2
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/file/kt-671.jav b/tests/testData/ast/boxedType/file/kt-671.jav
deleted file mode 100644
index c0ba6a8bc30..00000000000
--- a/tests/testData/ast/boxedType/file/kt-671.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo;
-
-class Test {
-  void test() {
-    Integer i = Integer.valueOf(100);
-    short s = 3;
-    Short ss = Short.valueOf(s);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/file/kt-671.kt b/tests/testData/ast/boxedType/file/kt-671.kt
deleted file mode 100644
index bb5c163ee24..00000000000
--- a/tests/testData/ast/boxedType/file/kt-671.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package demo
-open class Test() {
-open fun test() : Unit {
-var i : Int? = Integer.valueOf(100)
-var s : Short = 3
-var ss : Short? = java.lang.Short.valueOf(s)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/boolean.jav b/tests/testData/ast/boxedType/statement/boolean.jav
deleted file mode 100644
index ccd666e6ee8..00000000000
--- a/tests/testData/ast/boxedType/statement/boolean.jav
+++ /dev/null
@@ -1 +0,0 @@
-Boolean i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/boolean.kt b/tests/testData/ast/boxedType/statement/boolean.kt
deleted file mode 100644
index a04aa401cb4..00000000000
--- a/tests/testData/ast/boxedType/statement/boolean.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Boolean? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/byte.jav b/tests/testData/ast/boxedType/statement/byte.jav
deleted file mode 100644
index 14a750b548b..00000000000
--- a/tests/testData/ast/boxedType/statement/byte.jav
+++ /dev/null
@@ -1 +0,0 @@
-Byte i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/byte.kt b/tests/testData/ast/boxedType/statement/byte.kt
deleted file mode 100644
index c44367fae64..00000000000
--- a/tests/testData/ast/boxedType/statement/byte.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Byte? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/character.jav b/tests/testData/ast/boxedType/statement/character.jav
deleted file mode 100644
index 611a419cc54..00000000000
--- a/tests/testData/ast/boxedType/statement/character.jav
+++ /dev/null
@@ -1 +0,0 @@
-Character i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/character.kt b/tests/testData/ast/boxedType/statement/character.kt
deleted file mode 100644
index 66c64a43830..00000000000
--- a/tests/testData/ast/boxedType/statement/character.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Char? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/double.jav b/tests/testData/ast/boxedType/statement/double.jav
deleted file mode 100644
index 691af6d77f6..00000000000
--- a/tests/testData/ast/boxedType/statement/double.jav
+++ /dev/null
@@ -1 +0,0 @@
-Double i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/double.kt b/tests/testData/ast/boxedType/statement/double.kt
deleted file mode 100644
index ad23a49855d..00000000000
--- a/tests/testData/ast/boxedType/statement/double.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Double? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/float.jav b/tests/testData/ast/boxedType/statement/float.jav
deleted file mode 100644
index c283bbbe5fa..00000000000
--- a/tests/testData/ast/boxedType/statement/float.jav
+++ /dev/null
@@ -1 +0,0 @@
-Float i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/float.kt b/tests/testData/ast/boxedType/statement/float.kt
deleted file mode 100644
index 72df9c19575..00000000000
--- a/tests/testData/ast/boxedType/statement/float.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Float? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/integer.jav b/tests/testData/ast/boxedType/statement/integer.jav
deleted file mode 100644
index ce81c24fe40..00000000000
--- a/tests/testData/ast/boxedType/statement/integer.jav
+++ /dev/null
@@ -1 +0,0 @@
-Integer i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/integer.kt b/tests/testData/ast/boxedType/statement/integer.kt
deleted file mode 100644
index eb490098482..00000000000
--- a/tests/testData/ast/boxedType/statement/integer.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Int? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/long.jav b/tests/testData/ast/boxedType/statement/long.jav
deleted file mode 100644
index 9ca58295d8a..00000000000
--- a/tests/testData/ast/boxedType/statement/long.jav
+++ /dev/null
@@ -1 +0,0 @@
-Long i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/long.kt b/tests/testData/ast/boxedType/statement/long.kt
deleted file mode 100644
index aa1584ac634..00000000000
--- a/tests/testData/ast/boxedType/statement/long.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Long? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/object.jav b/tests/testData/ast/boxedType/statement/object.jav
deleted file mode 100644
index ca135870cd6..00000000000
--- a/tests/testData/ast/boxedType/statement/object.jav
+++ /dev/null
@@ -1 +0,0 @@
-Object i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/object.kt b/tests/testData/ast/boxedType/statement/object.kt
deleted file mode 100644
index 611c618a389..00000000000
--- a/tests/testData/ast/boxedType/statement/object.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Any? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/short.jav b/tests/testData/ast/boxedType/statement/short.jav
deleted file mode 100644
index 1364e5c8dbb..00000000000
--- a/tests/testData/ast/boxedType/statement/short.jav
+++ /dev/null
@@ -1 +0,0 @@
-Short i = 10;
\ No newline at end of file
diff --git a/tests/testData/ast/boxedType/statement/short.kt b/tests/testData/ast/boxedType/statement/short.kt
deleted file mode 100644
index 8daff77deb3..00000000000
--- a/tests/testData/ast/boxedType/statement/short.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Short? = 10
\ No newline at end of file
diff --git a/tests/testData/ast/breakStatement/statement/breakWithLabel.jav b/tests/testData/ast/breakStatement/statement/breakWithLabel.jav
deleted file mode 100644
index b2375dc68b4..00000000000
--- a/tests/testData/ast/breakStatement/statement/breakWithLabel.jav
+++ /dev/null
@@ -1 +0,0 @@
-break label;
\ No newline at end of file
diff --git a/tests/testData/ast/breakStatement/statement/breakWithLabel.kt b/tests/testData/ast/breakStatement/statement/breakWithLabel.kt
deleted file mode 100644
index 02d8620a138..00000000000
--- a/tests/testData/ast/breakStatement/statement/breakWithLabel.kt
+++ /dev/null
@@ -1 +0,0 @@
-break@label
\ No newline at end of file
diff --git a/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav b/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav
deleted file mode 100644
index 8cb76cf02d7..00000000000
--- a/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav
+++ /dev/null
@@ -1 +0,0 @@
-break;
\ No newline at end of file
diff --git a/tests/testData/ast/breakStatement/statement/breakWithoutLabel.kt b/tests/testData/ast/breakStatement/statement/breakWithoutLabel.kt
deleted file mode 100644
index 5da70343a46..00000000000
--- a/tests/testData/ast/breakStatement/statement/breakWithoutLabel.kt
+++ /dev/null
@@ -1 +0,0 @@
-break
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav b/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav
deleted file mode 100644
index 2278e35a1bc..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-class Library {
-  final static java.io.PrintStream ourOut;
-}
-
-class User {
-  void main() {
-    Library.ourOut.print();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryFieldCall.kt b/tests/testData/ast/callChainExpression/file/libraryFieldCall.kt
deleted file mode 100644
index 48516916f25..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryFieldCall.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-open class Library() {
-class object {
-val ourOut : java.io.PrintStream? = null
-}
-}
-open class User() {
-open fun main() : Unit {
-Library.ourOut?.print()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav b/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav
deleted file mode 100644
index 265696edc72..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-class Library {
-  static void call() {}
-
-  static String getString() { return ""; }
-}
-
-class User {
-  void main() {
-    Library.call();
-    Library.getString().isEmpty();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryMethodCall.kt b/tests/testData/ast/callChainExpression/file/libraryMethodCall.kt
deleted file mode 100644
index 3c0ee4c68a4..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryMethodCall.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-open class Library() {
-class object {
-open fun call() : Unit {
-}
-open fun getString() : String? {
-return ""
-}
-}
-}
-open class User() {
-open fun main() : Unit {
-Library.call()
-Library.getString()?.isEmpty()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav b/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav
deleted file mode 100644
index 3a22446070d..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav
+++ /dev/null
@@ -1,16 +0,0 @@
-class Library {
-  void call() {}
-
-  String getString() { return ""; }
-}
-
-class User {
-  void main() {
-    Library lib = new Library();
-    lib.call();
-    lib.getString().isEmpty();
-
-    new Library().call();
-    new Library().getString().isEmpty();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt b/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt
deleted file mode 100644
index b8a02f01152..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-open class Library() {
-open fun call() : Unit {
-}
-open fun getString() : String? {
-return ""
-}
-}
-open class User() {
-open fun main() : Unit {
-var lib : Library? = Library()
-lib?.call()
-lib?.getString()?.isEmpty()
-Library().call()
-Library().getString()?.isEmpty()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav b/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav
deleted file mode 100644
index 67d826da1d9..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-class Library {
-  final public String myString;
-}
-
-class User {
-  void main() {
-    Library.myString.isEmpty();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.kt b/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.kt
deleted file mode 100644
index 9e0de14ec3c..00000000000
--- a/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-open class Library() {
-public val myString : String? = null
-}
-open class User() {
-open fun main() : Unit {
-Library.myString?.isEmpty()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/statement/sout.jav b/tests/testData/ast/callChainExpression/statement/sout.jav
deleted file mode 100644
index a16cbe89562..00000000000
--- a/tests/testData/ast/callChainExpression/statement/sout.jav
+++ /dev/null
@@ -1 +0,0 @@
-System.out.println("Hello, world");
\ No newline at end of file
diff --git a/tests/testData/ast/callChainExpression/statement/sout.kt b/tests/testData/ast/callChainExpression/statement/sout.kt
deleted file mode 100644
index 183416fbb5f..00000000000
--- a/tests/testData/ast/callChainExpression/statement/sout.kt
+++ /dev/null
@@ -1 +0,0 @@
-System.out?.println("Hello, world")
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/abstractClass.jav b/tests/testData/ast/class/class/abstractClass.jav
deleted file mode 100644
index 0ff487db135..00000000000
--- a/tests/testData/ast/class/class/abstractClass.jav
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract class A { 
-  abstract void callme();
-
-  void callmetoo() {
-    print("This is a concrete method.");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/abstractClass.kt b/tests/testData/ast/class/class/abstractClass.kt
deleted file mode 100644
index e7fb293e5af..00000000000
--- a/tests/testData/ast/class/class/abstractClass.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-abstract class A() {
-abstract fun callme() : Unit
-open fun callmetoo() : Unit {
-print("This is a concrete method.")
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/abstractClassShape.jav b/tests/testData/ast/class/class/abstractClassShape.jav
deleted file mode 100644
index a6b01569bbb..00000000000
--- a/tests/testData/ast/class/class/abstractClassShape.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract class Shape {
-	public String color;
-	public Shape() {
-	}
-	public void setColor(String c) {
-		color = c;
-	}
-	public String getColor() {
-		return color;
-	}
-	public abstract double area();
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/abstractClassShape.kt b/tests/testData/ast/class/class/abstractClassShape.kt
deleted file mode 100644
index 8525a28f1b8..00000000000
--- a/tests/testData/ast/class/class/abstractClassShape.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-abstract class Shape() {
-public var color : String? = null
-public open fun setColor(c : String?) : Unit {
-color = c
-}
-public open fun getColor() : String? {
-return color
-}
-public abstract fun area() : Double
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/class.jav b/tests/testData/ast/class/class/class.jav
deleted file mode 100644
index 183c3f5b3be..00000000000
--- a/tests/testData/ast/class/class/class.jav
+++ /dev/null
@@ -1 +0,0 @@
-class Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/class.kt b/tests/testData/ast/class/class/class.kt
deleted file mode 100644
index bc29d4b27a1..00000000000
--- a/tests/testData/ast/class/class/class.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-open class Test() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/classWithEmptyMethods.jav b/tests/testData/ast/class/class/classWithEmptyMethods.jav
deleted file mode 100644
index 49ec763ae8f..00000000000
--- a/tests/testData/ast/class/class/classWithEmptyMethods.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class T {void main() {}int i() {}String s() {}}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/classWithEmptyMethods.kt b/tests/testData/ast/class/class/classWithEmptyMethods.kt
deleted file mode 100644
index 18ced74776d..00000000000
--- a/tests/testData/ast/class/class/classWithEmptyMethods.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class T() {
-fun main() : Unit {
-}
-fun i() : Int {
-}
-fun s() : String? {
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/classWithFields.jav b/tests/testData/ast/class/class/classWithFields.jav
deleted file mode 100644
index c7059937021..00000000000
--- a/tests/testData/ast/class/class/classWithFields.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class T {String a = "abc";int b = 10;}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/classWithFields.kt b/tests/testData/ast/class/class/classWithFields.kt
deleted file mode 100644
index defec3e4ac3..00000000000
--- a/tests/testData/ast/class/class/classWithFields.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class T() {
-var a : String? = "abc"
-var b : Int = 10
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/classWithMultiplyFields.jav b/tests/testData/ast/class/class/classWithMultiplyFields.jav
deleted file mode 100644
index 6fd5e1a9865..00000000000
--- a/tests/testData/ast/class/class/classWithMultiplyFields.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class T {String a, b, c = "abc";}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/classWithMultiplyFields.kt b/tests/testData/ast/class/class/classWithMultiplyFields.kt
deleted file mode 100644
index 7f77e2e0cbd..00000000000
--- a/tests/testData/ast/class/class/classWithMultiplyFields.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class T() {
-var a : String? = null
-var b : String? = null
-var c : String? = "abc"
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/emptyClass.jav b/tests/testData/ast/class/class/emptyClass.jav
deleted file mode 100644
index 151119ab6a7..00000000000
--- a/tests/testData/ast/class/class/emptyClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class A {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/emptyClass.kt b/tests/testData/ast/class/class/emptyClass.kt
deleted file mode 100644
index 161cb193d08..00000000000
--- a/tests/testData/ast/class/class/emptyClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class A() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav b/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav
deleted file mode 100644
index b306e379a44..00000000000
--- a/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class A extends Base implements I {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt b/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt
deleted file mode 100644
index 7206c054962..00000000000
--- a/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class A() : Base(), I {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav
deleted file mode 100644
index dd454cafdb7..00000000000
--- a/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class A extends Base implements I0, I1, I2 {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt
deleted file mode 100644
index 7812e054bda..00000000000
--- a/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class A() : Base(), I0, I1, I2 {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/finalClass.jav b/tests/testData/ast/class/class/finalClass.jav
deleted file mode 100644
index 5071bba9931..00000000000
--- a/tests/testData/ast/class/class/finalClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/finalClass.kt b/tests/testData/ast/class/class/finalClass.kt
deleted file mode 100644
index 98c16b37053..00000000000
--- a/tests/testData/ast/class/class/finalClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class Test() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/genericClass.jav b/tests/testData/ast/class/class/genericClass.jav
deleted file mode 100644
index b18123be7cb..00000000000
--- a/tests/testData/ast/class/class/genericClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class Entry<K, V> {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/genericClass.kt b/tests/testData/ast/class/class/genericClass.kt
deleted file mode 100644
index f3565e5ec30..00000000000
--- a/tests/testData/ast/class/class/genericClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class Entry<K, V>() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/innerEmptyClass.jav b/tests/testData/ast/class/class/innerEmptyClass.jav
deleted file mode 100644
index 3053641622a..00000000000
--- a/tests/testData/ast/class/class/innerEmptyClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class A { inner final class B {} }
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/innerEmptyClass.kt b/tests/testData/ast/class/class/innerEmptyClass.kt
deleted file mode 100644
index 983e65e757e..00000000000
--- a/tests/testData/ast/class/class/innerEmptyClass.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class A() {
-class B() {
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/innerStaticClass.jav b/tests/testData/ast/class/class/innerStaticClass.jav
deleted file mode 100644
index d0885630764..00000000000
--- a/tests/testData/ast/class/class/innerStaticClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class S { static class Inner {} }
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/innerStaticClass.kt b/tests/testData/ast/class/class/innerStaticClass.kt
deleted file mode 100644
index dc0ae41dff2..00000000000
--- a/tests/testData/ast/class/class/innerStaticClass.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-class S() {
-class object {
-open class Inner() {
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/internalClass.jav b/tests/testData/ast/class/class/internalClass.jav
deleted file mode 100644
index 183c3f5b3be..00000000000
--- a/tests/testData/ast/class/class/internalClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-class Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/internalClass.kt b/tests/testData/ast/class/class/internalClass.kt
deleted file mode 100644
index bc29d4b27a1..00000000000
--- a/tests/testData/ast/class/class/internalClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-open class Test() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav b/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav
deleted file mode 100644
index 0e0b14688a4..00000000000
--- a/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class S { boolean sB() { return true; } static int myI = 10; }
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.kt b/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.kt
deleted file mode 100644
index 7be6598f76a..00000000000
--- a/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class S() {
-fun sB() : Boolean {
-return true
-}
-class object {
-var myI : Int = 10
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/oneStaticMethod.jav b/tests/testData/ast/class/class/oneStaticMethod.jav
deleted file mode 100644
index 98884d114b7..00000000000
--- a/tests/testData/ast/class/class/oneStaticMethod.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class S { static boolean staticF() { return true; } }
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/oneStaticMethod.kt b/tests/testData/ast/class/class/oneStaticMethod.kt
deleted file mode 100644
index beb564521e3..00000000000
--- a/tests/testData/ast/class/class/oneStaticMethod.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-class S() {
-class object {
-fun staticF() : Boolean {
-return true
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav b/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav
deleted file mode 100644
index 4c6915861c5..00000000000
--- a/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class S { boolean sB() { return true; } static int sI() { return 1; } }
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.kt b/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.kt
deleted file mode 100644
index cb96091ed53..00000000000
--- a/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-class S() {
-fun sB() : Boolean {
-return true
-}
-class object {
-fun sI() : Int {
-return 1
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/pivateClass.jav b/tests/testData/ast/class/class/pivateClass.jav
deleted file mode 100644
index 91cc7a0e937..00000000000
--- a/tests/testData/ast/class/class/pivateClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-private class Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/pivateClass.kt b/tests/testData/ast/class/class/pivateClass.kt
deleted file mode 100644
index 96001c69f28..00000000000
--- a/tests/testData/ast/class/class/pivateClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-private open class Test() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/protectedClass.jav b/tests/testData/ast/class/class/protectedClass.jav
deleted file mode 100644
index d27e53f5081..00000000000
--- a/tests/testData/ast/class/class/protectedClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-protected class Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/protectedClass.kt b/tests/testData/ast/class/class/protectedClass.kt
deleted file mode 100644
index e82caa26cd0..00000000000
--- a/tests/testData/ast/class/class/protectedClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-protected open class Test() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/publicClass.jav b/tests/testData/ast/class/class/publicClass.jav
deleted file mode 100644
index 099aac22fd3..00000000000
--- a/tests/testData/ast/class/class/publicClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-public class Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/publicClass.kt b/tests/testData/ast/class/class/publicClass.kt
deleted file mode 100644
index 98e32f1aca0..00000000000
--- a/tests/testData/ast/class/class/publicClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-public open class Test() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/simpleInheritance.jav b/tests/testData/ast/class/class/simpleInheritance.jav
deleted file mode 100644
index 01916ab4d7b..00000000000
--- a/tests/testData/ast/class/class/simpleInheritance.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class A extends Base {}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/simpleInheritance.kt b/tests/testData/ast/class/class/simpleInheritance.kt
deleted file mode 100644
index 7bf6ef80f75..00000000000
--- a/tests/testData/ast/class/class/simpleInheritance.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class A() : Base() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/twoStaticMethod.jav b/tests/testData/ast/class/class/twoStaticMethod.jav
deleted file mode 100644
index b69b1398e17..00000000000
--- a/tests/testData/ast/class/class/twoStaticMethod.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class S { static boolean sB() { return true; } static int sI() { return 1; } }
\ No newline at end of file
diff --git a/tests/testData/ast/class/class/twoStaticMethod.kt b/tests/testData/ast/class/class/twoStaticMethod.kt
deleted file mode 100644
index 87bd397e519..00000000000
--- a/tests/testData/ast/class/class/twoStaticMethod.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-class S() {
-class object {
-fun sB() : Boolean {
-return true
-}
-fun sI() : Int {
-return 1
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/file/kt-639.jav b/tests/testData/ast/class/file/kt-639.jav
deleted file mode 100644
index 102ae0c907b..00000000000
--- a/tests/testData/ast/class/file/kt-639.jav
+++ /dev/null
@@ -1,18 +0,0 @@
-package demo;
-
-import java.util.HashMap;
-
-class Test {
-  Test() {  }
-  Test(String s) {  }
-}
-
-class User {
-  void main() {
-    HashMap m = new HashMap(1);
-    HashMap m2 = new HashMap(10);
-
-    Test t1 = new Test();
-    Test t2 = new Test("");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/file/kt-639.kt b/tests/testData/ast/class/file/kt-639.kt
deleted file mode 100644
index fe438a103ec..00000000000
--- a/tests/testData/ast/class/file/kt-639.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package demo
-import java.util.HashMap
-open class Test() {
-class object {
-open fun init() : Test {
-val __ = Test()
-return __
-}
-open fun init(s : String?) : Test {
-val __ = Test()
-return __
-}
-}
-}
-open class User() {
-open fun main() : Unit {
-var m : HashMap<Any?, Any?>? = HashMap(1)
-var m2 : HashMap<Any?, Any?>? = HashMap(10)
-var t1 : Test? = Test.init()
-var t2 : Test? = Test.init("")
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/file/privateInit.jav b/tests/testData/ast/class/file/privateInit.jav
deleted file mode 100644
index 5a65a0cc32b..00000000000
--- a/tests/testData/ast/class/file/privateInit.jav
+++ /dev/null
@@ -1,4 +0,0 @@
-public class MyClass {
-  private void init(int arg1, int arg2, int arg3) {
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/class/file/privateInit.kt b/tests/testData/ast/class/file/privateInit.kt
deleted file mode 100644
index 4f86265d153..00000000000
--- a/tests/testData/ast/class/file/privateInit.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-public open class MyClass() {
-private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/classExpression/expression/objectClass.jav b/tests/testData/ast/classExpression/expression/objectClass.jav
deleted file mode 100644
index b5c1a920fca..00000000000
--- a/tests/testData/ast/classExpression/expression/objectClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-Object.class
\ No newline at end of file
diff --git a/tests/testData/ast/classExpression/expression/objectClass.kt b/tests/testData/ast/classExpression/expression/objectClass.kt
deleted file mode 100644
index a23b22175d5..00000000000
--- a/tests/testData/ast/classExpression/expression/objectClass.kt
+++ /dev/null
@@ -1 +0,0 @@
-javaClass<Any>()
\ No newline at end of file
diff --git a/tests/testData/ast/classExpression/expression/stringClass.jav b/tests/testData/ast/classExpression/expression/stringClass.jav
deleted file mode 100644
index 025387a83e8..00000000000
--- a/tests/testData/ast/classExpression/expression/stringClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-String.class
\ No newline at end of file
diff --git a/tests/testData/ast/classExpression/expression/stringClass.kt b/tests/testData/ast/classExpression/expression/stringClass.kt
deleted file mode 100644
index 49f7ad88685..00000000000
--- a/tests/testData/ast/classExpression/expression/stringClass.kt
+++ /dev/null
@@ -1 +0,0 @@
-javaClass<String>()
\ No newline at end of file
diff --git a/tests/testData/ast/classExpression/statement/complexExample.jav b/tests/testData/ast/classExpression/statement/complexExample.jav
deleted file mode 100644
index a74d8698493..00000000000
--- a/tests/testData/ast/classExpression/statement/complexExample.jav
+++ /dev/null
@@ -1 +0,0 @@
-Class<?>[] constrArgTypes = new Class<?>[]{String[].class, String.class};
\ No newline at end of file
diff --git a/tests/testData/ast/classExpression/statement/complexExample.kt b/tests/testData/ast/classExpression/statement/complexExample.kt
deleted file mode 100644
index 40638ad4462..00000000000
--- a/tests/testData/ast/classExpression/statement/complexExample.kt
+++ /dev/null
@@ -1 +0,0 @@
-var constrArgTypes : Array<Class<*>?>? = array<Class<*>?>(javaClass<Array<String?>>(), javaClass<String>())
\ No newline at end of file
diff --git a/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav b/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav
deleted file mode 100644
index 3e742448544..00000000000
--- a/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav
+++ /dev/null
@@ -1 +0,0 @@
-a.isEmpty() ? 0 : 1
\ No newline at end of file
diff --git a/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt b/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt
deleted file mode 100644
index 85131998260..00000000000
--- a/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-(if (a.isEmpty())
-0
-else
-1)
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/allCallsPrimary.jav b/tests/testData/ast/constructors/file/allCallsPrimary.jav
deleted file mode 100644
index 997b50c969c..00000000000
--- a/tests/testData/ast/constructors/file/allCallsPrimary.jav
+++ /dev/null
@@ -1,20 +0,0 @@
-class C {
-  C(int arg1, int arg2, int arg3) {
-  }
-
-  C(int arg1, int arg2) {
-    this(arg1, arg2, 0);
-  }
-
-  C(int arg1) {
-    this(arg1, 0, 0);
-  }
-}
-
-public class User {
-  public static void main() {
-     C c1 = new C(100, 100, 100);
-     C c2 = new C(100, 100);
-     C c3 = new C(100);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/allCallsPrimary.kt b/tests/testData/ast/constructors/file/allCallsPrimary.kt
deleted file mode 100644
index 38a7eb1ddee..00000000000
--- a/tests/testData/ast/constructors/file/allCallsPrimary.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-open class C(arg1 : Int, arg2 : Int, arg3 : Int) {
-class object {
-open fun init(arg1 : Int, arg2 : Int) : C {
-val __ = C(arg1, arg2, 0)
-return __
-}
-open fun init(arg1 : Int) : C {
-val __ = C(arg1, 0, 0)
-return __
-}
-}
-}
-public open class User() {
-class object {
-public open fun main() : Unit {
-var c1 : C? = C(100, 100, 100)
-var c2 : C? = C.init(100, 100)
-var c3 : C? = C.init(100)
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/allCallsPrimary2.jav b/tests/testData/ast/constructors/file/allCallsPrimary2.jav
deleted file mode 100644
index 45b045051bc..00000000000
--- a/tests/testData/ast/constructors/file/allCallsPrimary2.jav
+++ /dev/null
@@ -1,31 +0,0 @@
-class C {
-  final int myArg1;
-  int myArg2;
-  int myArg3;
-
-  C(int arg1, int arg2, int arg3) {
-    this(arg1);
-    myArg2 = arg2;
-    myArg3 = arg3;
-  }
-
-  C(int arg1, int arg2) {
-    this(arg1);
-    myArg2 = arg2;
-    myArg3 = 0;
-  }
-
-  C(int arg1) {
-    myArg1 = arg1;
-    myArg2 = 0;
-    myArg3 = 0;
-  }
-}
-
-public class User {
-  public static void main() {
-     C c1 = new C(100, 100, 100);
-     C c2 = new C(100, 100);
-     C c3 = new C(100);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/allCallsPrimary2.kt b/tests/testData/ast/constructors/file/allCallsPrimary2.kt
deleted file mode 100644
index e6f383fa362..00000000000
--- a/tests/testData/ast/constructors/file/allCallsPrimary2.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-open class C(arg1 : Int) {
-val myArg1 : Int
-var myArg2 : Int = 0
-var myArg3 : Int = 0
-{
-myArg1 = arg1
-myArg2 = 0
-myArg3 = 0
-}
-class object {
-open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : C {
-val __ = C(arg1)
-__.myArg2 = arg2
-__.myArg3 = arg3
-return __
-}
-open fun init(arg1 : Int, arg2 : Int) : C {
-val __ = C(arg1)
-__.myArg2 = arg2
-__.myArg3 = 0
-return __
-}
-}
-}
-public open class User() {
-class object {
-public open fun main() : Unit {
-var c1 : C? = C.init(100, 100, 100)
-var c2 : C? = C.init(100, 100)
-var c3 : C? = C(100)
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/customerBuilder.jav b/tests/testData/ast/constructors/file/customerBuilder.jav
deleted file mode 100644
index 4f99ad3c63d..00000000000
--- a/tests/testData/ast/constructors/file/customerBuilder.jav
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.test.customer
-
-class Customer {
-  public final String _firstName;
-  public final String _lastName;
-
-  Customer(String first, String last) {
-    doSmthBefore();
-    _firstName = first;
-    _lastName = last;
-    doSmthAfter();
-  }
-
-  public String getFirstName() {
-    return _firstName;
-  }
-
-  public String getLastName() {
-    return _lastName;
-  }
-
-  private void doSmthBefore() {}
-  private void doSmthAfter() {}
-}
-
-class CustomerBuilder {
-  public String _firstName = "Homer";
-  public String _lastName = "Simpson";
-
-  public CustomerBuilder WithFirstName(String firstName) {
-    _firstName = firstName;
-    return this;
-  }
-
-  public CustomerBuilder WithLastName(String lastName) {
-    _lastName = lastName;
-    return this;
-  }
-
-  public Customer Build() {
-    return new Customer(_firstName, _lastName);
-  }
-}
-
-public class User {
-  public static void main(Array[String] args) {
-     Customer customer = new CustomerBuilder()
-       .WithFirstName("Homer")
-       .WithLastName("Simpson")
-       .Build();
-     System.out.println(customer.getFirstName());
-     System.out.println(customer.getLastName());
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/customerBuilder.kt b/tests/testData/ast/constructors/file/customerBuilder.kt
deleted file mode 100644
index b2573d9b469..00000000000
--- a/tests/testData/ast/constructors/file/customerBuilder.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.test.customer
-open class Customer(first : String?, last : String?) {
-public val _firstName : String?
-public val _lastName : String?
-public open fun getFirstName() : String? {
-return _firstName
-}
-public open fun getLastName() : String? {
-return _lastName
-}
-private fun doSmthBefore() : Unit {
-}
-private fun doSmthAfter() : Unit {
-}
-{
-doSmthBefore()
-_firstName = first
-_lastName = last
-doSmthAfter()
-}
-}
-open class CustomerBuilder() {
-public var _firstName : String? = "Homer"
-public var _lastName : String? = "Simpson"
-public open fun WithFirstName(firstName : String?) : CustomerBuilder? {
-_firstName = firstName
-return this
-}
-public open fun WithLastName(lastName : String?) : CustomerBuilder? {
-_lastName = lastName
-return this
-}
-public open fun Build() : Customer? {
-return Customer(_firstName, _lastName)
-}
-}
-public open class User() {
-class object {
-public open fun main() : Unit {
-var customer : Customer? = CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build()
-System.out?.println(customer?.getFirstName())
-System.out?.println(customer?.getLastName())
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/genericIdentifier.jav b/tests/testData/ast/constructors/file/genericIdentifier.jav
deleted file mode 100644
index c77f997a1c6..00000000000
--- a/tests/testData/ast/constructors/file/genericIdentifier.jav
+++ /dev/null
@@ -1,33 +0,0 @@
-public class Identifier<T> {
-  private final T myName;
-  private boolean myHasDollar;
-  private boolean myNullable = true;
-
-  public Identifier(T name) {
-    myName = name;
-  }
-
-  public Identifier(T name, boolean isNullable) {
-    myName = name;
-    myNullable = isNullable;
-  }
-
-  public Identifier(T name, boolean hasDollar, boolean isNullable) {
-    myName = name;
-    myHasDollar = hasDollar;
-    myNullable = isNullable;
-  }
-
-  @Override
-  public T getName() {
-    return myName;
-  }
-}
-
-public class User {
-  public static void main() {
-     Identifier<?> i1 = new Identifier<String>("name", false, true);
-     Identifier i2 = new Identifier<String>("name", false);
-     Identifier i3 = new Identifier<String>("name");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/genericIdentifier.kt b/tests/testData/ast/constructors/file/genericIdentifier.kt
deleted file mode 100644
index e237eeee52d..00000000000
--- a/tests/testData/ast/constructors/file/genericIdentifier.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
-private val myName : T?
-private var myHasDollar : Boolean = false
-private var myNullable : Boolean = true
-public open fun getName() : T? {
-return myName
-}
-{
-myName = _myName
-myHasDollar = _myHasDollar
-}
-class object {
-public open fun init<T>(name : T?) : Identifier<T> {
-val __ = Identifier(name, false)
-return __
-}
-public open fun init<T>(name : T?, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, false)
-__.myNullable = isNullable
-return __
-}
-public open fun init<T>(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, hasDollar)
-__.myNullable = isNullable
-return __
-}
-}
-}
-public open class User() {
-class object {
-public open fun main() : Unit {
-var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<*>? = Identifier.init<String?>("name")
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/identifier.jav b/tests/testData/ast/constructors/file/identifier.jav
deleted file mode 100644
index 929628643c8..00000000000
--- a/tests/testData/ast/constructors/file/identifier.jav
+++ /dev/null
@@ -1,33 +0,0 @@
-public class Identifier {
-  private final String myName;
-  private boolean myHasDollar;
-  private boolean myNullable = true;
-
-  public Identifier(String name) {
-    myName = name;
-  }
-
-  public Identifier(String name, boolean isNullable) {
-    myName = name;
-    myNullable = isNullable;
-  }
-
-  public Identifier(String name, boolean hasDollar, boolean isNullable) {
-    myName = name;
-    myHasDollar = hasDollar;
-    myNullable = isNullable;
-  }
-
-  @Override
-  public String getName() {
-    return myName;
-  }
-}
-
-public class User {
-  public static void main() {
-     Identifier i1 = new Identifier("name", false, true);
-     Identifier i2 = new Identifier("name", false);
-     Identifier i3 = new Identifier("name");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/identifier.kt b/tests/testData/ast/constructors/file/identifier.kt
deleted file mode 100644
index c627d0821be..00000000000
--- a/tests/testData/ast/constructors/file/identifier.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-public open class Identifier(_myName : String?, _myHasDollar : Boolean) {
-private val myName : String?
-private var myHasDollar : Boolean = false
-private var myNullable : Boolean = true
-public open fun getName() : String? {
-return myName
-}
-{
-myName = _myName
-myHasDollar = _myHasDollar
-}
-class object {
-public open fun init(name : String?) : Identifier {
-val __ = Identifier(name, false)
-return __
-}
-public open fun init(name : String?, isNullable : Boolean) : Identifier {
-val __ = Identifier(name, false)
-__.myNullable = isNullable
-return __
-}
-public open fun init(name : String?, hasDollar : Boolean, isNullable : Boolean) : Identifier {
-val __ = Identifier(name, hasDollar)
-__.myNullable = isNullable
-return __
-}
-}
-}
-public open class User() {
-class object {
-public open fun main() : Unit {
-var i1 : Identifier? = Identifier.init("name", false, true)
-var i2 : Identifier? = Identifier.init("name", false)
-var i3 : Identifier? = Identifier.init("name")
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/withManyDefaultParams.jav b/tests/testData/ast/constructors/file/withManyDefaultParams.jav
deleted file mode 100644
index c8d04543b0b..00000000000
--- a/tests/testData/ast/constructors/file/withManyDefaultParams.jav
+++ /dev/null
@@ -1,24 +0,0 @@
-public class Test {
-  private final String myName;
-  private boolean a;
-  private double b;
-  private float c;
-  private long d;
-  private int e;
-  private short f;
-  private char g;
-
-  public Test() {}
-
-  public Test(String name) {
-    myName = foo(name);
-  }
-
-  static String foo(String n) {return "";}
-}
-
-public class User {
-  public static void main() {
-     Test t = new Test("name");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/constructors/file/withManyDefaultParams.kt b/tests/testData/ast/constructors/file/withManyDefaultParams.kt
deleted file mode 100644
index 434c34a10b2..00000000000
--- a/tests/testData/ast/constructors/file/withManyDefaultParams.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-public open class Test(_myName : String?, _a : Boolean, _b : Double, _c : Float, _d : Long, _e : Int, _f : Short, _g : Char) {
-private val myName : String?
-private var a : Boolean = false
-private var b : Double = 0.toDouble()
-private var c : Float = 0.toFloat()
-private var d : Long = 0
-private var e : Int = 0
-private var f : Short = 0
-private var g : Char = ' '
-{
-myName = _myName
-a = _a
-b = _b
-c = _c
-d = _d
-e = _e
-f = _f
-g = _g
-}
-class object {
-public open fun init() : Test {
-val __ = Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
-return __
-}
-public open fun init(name : String?) : Test {
-val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
-return __
-}
-open fun foo(n : String?) : String? {
-return ""
-}
-}
-}
-public open class User() {
-class object {
-public open fun main() : Unit {
-var t : Test? = Test.init("name")
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/continueStatement/statement/continueWithLabel.jav b/tests/testData/ast/continueStatement/statement/continueWithLabel.jav
deleted file mode 100644
index aa7bbb7cd89..00000000000
--- a/tests/testData/ast/continueStatement/statement/continueWithLabel.jav
+++ /dev/null
@@ -1 +0,0 @@
-continue label;
\ No newline at end of file
diff --git a/tests/testData/ast/continueStatement/statement/continueWithLabel.kt b/tests/testData/ast/continueStatement/statement/continueWithLabel.kt
deleted file mode 100644
index 9dc6020680e..00000000000
--- a/tests/testData/ast/continueStatement/statement/continueWithLabel.kt
+++ /dev/null
@@ -1 +0,0 @@
-continue@label
\ No newline at end of file
diff --git a/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav b/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav
deleted file mode 100644
index 45127c0ad12..00000000000
--- a/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav
+++ /dev/null
@@ -1 +0,0 @@
-continue;
\ No newline at end of file
diff --git a/tests/testData/ast/continueStatement/statement/continueWithoutLabel.kt b/tests/testData/ast/continueStatement/statement/continueWithoutLabel.kt
deleted file mode 100644
index b2960313c53..00000000000
--- a/tests/testData/ast/continueStatement/statement/continueWithoutLabel.kt
+++ /dev/null
@@ -1 +0,0 @@
-continue
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav b/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav
deleted file mode 100644
index 42d4cea5522..00000000000
--- a/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-final int k, l, m;
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt b/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt
deleted file mode 100644
index 08a84179833..00000000000
--- a/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-val k : Int
-val l : Int
-val m : Int
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav b/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav
deleted file mode 100644
index 219f057f8f0..00000000000
--- a/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-int k, l, m;
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt b/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt
deleted file mode 100644
index 357bb10b11e..00000000000
--- a/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-var k : Int
-var l : Int
-var m : Int
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav b/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav
deleted file mode 100644
index 79db42cfc1c..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-final int s;
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt b/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt
deleted file mode 100644
index 0ff0482bb0f..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt
+++ /dev/null
@@ -1 +0,0 @@
-val s : Int
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav b/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav
deleted file mode 100644
index 0d5e93f00ff..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-final String s;
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt b/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt
deleted file mode 100644
index 734800a644c..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt
+++ /dev/null
@@ -1 +0,0 @@
-val s : String?
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav b/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav
deleted file mode 100644
index ee7cd0becae..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-int s;
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.kt b/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.kt
deleted file mode 100644
index 3639cd90f4a..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.kt
+++ /dev/null
@@ -1 +0,0 @@
-var s : Int
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav b/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav
deleted file mode 100644
index 8f1adbb52a5..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-String s;
\ No newline at end of file
diff --git a/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.kt b/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.kt
deleted file mode 100644
index 4bdd5d14ca2..00000000000
--- a/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.kt
+++ /dev/null
@@ -1 +0,0 @@
-var s : String?
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav b/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav
deleted file mode 100644
index 48a9639a646..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav
+++ /dev/null
@@ -1 +0,0 @@
-do {int i = 1; i = i + 1;} while (a > b)
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithBlock.kt b/tests/testData/ast/doWhileStatement/statement/whileWithBlock.kt
deleted file mode 100644
index d86f9999196..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithBlock.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-do
-{
-var i : Int = 1
-i = i + 1
-}
-while (a > b)
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav b/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav
deleted file mode 100644
index b57bb051009..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav
+++ /dev/null
@@ -1 +0,0 @@
-do {} while (true)
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt b/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt
deleted file mode 100644
index 7018b864e5e..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-do
-{
-}
-while (true)
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav b/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav
deleted file mode 100644
index e724468b028..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav
+++ /dev/null
@@ -1 +0,0 @@
-do i = i + 1; while (true)
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithExpression.kt b/tests/testData/ast/doWhileStatement/statement/whileWithExpression.kt
deleted file mode 100644
index a20c7c5d83d..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithExpression.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-do
-i = i + 1
-while (true)
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav b/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav
deleted file mode 100644
index 6ca0c6cd1b2..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav
+++ /dev/null
@@ -1 +0,0 @@
-do return 1; while (true)
\ No newline at end of file
diff --git a/tests/testData/ast/doWhileStatement/statement/whileWithReturn.kt b/tests/testData/ast/doWhileStatement/statement/whileWithReturn.kt
deleted file mode 100644
index 21de9dff87a..00000000000
--- a/tests/testData/ast/doWhileStatement/statement/whileWithReturn.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-do
-return 1
-while (true)
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/colorEnum.jav b/tests/testData/ast/enum/class/colorEnum.jav
deleted file mode 100644
index d59c8198ccd..00000000000
--- a/tests/testData/ast/enum/class/colorEnum.jav
+++ /dev/null
@@ -1,16 +0,0 @@
-package demo;
-
-enum MyEnum {
-  RED(10),
-  BLUE(20);
-
-  private final int color;
-
-  private MyEnum(int _color) {
-    color = _color;
-  }
-
-  public int getColor() {
-    return color;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/colorEnum.kt b/tests/testData/ast/enum/class/colorEnum.kt
deleted file mode 100644
index 39fb85952d6..00000000000
--- a/tests/testData/ast/enum/class/colorEnum.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package demo
-enum class MyEnum(_color : Int) {
-RED : MyEnum(10)
-BLUE : MyEnum(20)
-private val color : Int
-public fun getColor() : Int {
-return color
-}
-{
-color = _color
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/emptyEnum.jav b/tests/testData/ast/enum/class/emptyEnum.jav
deleted file mode 100644
index 6374d13e5e5..00000000000
--- a/tests/testData/ast/enum/class/emptyEnum.jav
+++ /dev/null
@@ -1 +0,0 @@
-enum A {}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/emptyEnum.kt b/tests/testData/ast/enum/class/emptyEnum.kt
deleted file mode 100644
index c8338128138..00000000000
--- a/tests/testData/ast/enum/class/emptyEnum.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-enum class A {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumConstantIsNotNull.jav b/tests/testData/ast/enum/class/enumConstantIsNotNull.jav
deleted file mode 100644
index b6dbf7edc50..00000000000
--- a/tests/testData/ast/enum/class/enumConstantIsNotNull.jav
+++ /dev/null
@@ -1,7 +0,0 @@
-enum E {
-  FOO;
-
-  void foo() {
-    FOO.toString();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumConstantIsNotNull.kt b/tests/testData/ast/enum/class/enumConstantIsNotNull.kt
deleted file mode 100644
index 62a8e2019a2..00000000000
--- a/tests/testData/ast/enum/class/enumConstantIsNotNull.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-enum class E {
-FOO
-fun foo() : Unit {
-FOO.toString()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumImplementsOneInterface.jav b/tests/testData/ast/enum/class/enumImplementsOneInterface.jav
deleted file mode 100644
index c2e20825bfe..00000000000
--- a/tests/testData/ast/enum/class/enumImplementsOneInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-enum A implements I {}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumImplementsOneInterface.kt b/tests/testData/ast/enum/class/enumImplementsOneInterface.kt
deleted file mode 100644
index 9cd0e207155..00000000000
--- a/tests/testData/ast/enum/class/enumImplementsOneInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-enum class A : I {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav b/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav
deleted file mode 100644
index 0334953a275..00000000000
--- a/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav
+++ /dev/null
@@ -1 +0,0 @@
-enum A implements I0, I1, I2 {}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt b/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
deleted file mode 100644
index 9cf25118b35..00000000000
--- a/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-enum class A : I0, I1, I2 {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumWithNameField.jav b/tests/testData/ast/enum/class/enumWithNameField.jav
deleted file mode 100644
index 30f259ecb0f..00000000000
--- a/tests/testData/ast/enum/class/enumWithNameField.jav
+++ /dev/null
@@ -1 +0,0 @@
-enum E { I; private String name; }
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/enumWithNameField.kt b/tests/testData/ast/enum/class/enumWithNameField.kt
deleted file mode 100644
index 6419d8e9907..00000000000
--- a/tests/testData/ast/enum/class/enumWithNameField.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-enum class E {
-I
-private var name : String? = null
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav b/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav
deleted file mode 100644
index 210e6919883..00000000000
--- a/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-enum Color {
-  WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25);
-
-  private int code;
-
-  private Color(int c) {
-    code = c;
-  }
-
-  public int getCode() {
-    return code;
-  }
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt b/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
deleted file mode 100644
index 6fdb4ebc7cc..00000000000
--- a/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-enum class Color(c : Int) {
-WHITE : Color(21)
-BLACK : Color(22)
-RED : Color(23)
-YELLOW : Color(24)
-BLUE : Color(25)
-private var code : Int = 0
-public fun getCode() : Int {
-return code
-}
-{
-code = c
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/internalEnum.jav b/tests/testData/ast/enum/class/internalEnum.jav
deleted file mode 100644
index 5ac159fa355..00000000000
--- a/tests/testData/ast/enum/class/internalEnum.jav
+++ /dev/null
@@ -1 +0,0 @@
-enum Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/internalEnum.kt b/tests/testData/ast/enum/class/internalEnum.kt
deleted file mode 100644
index 79279032cc3..00000000000
--- a/tests/testData/ast/enum/class/internalEnum.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-enum class Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/overrideToString.jav b/tests/testData/ast/enum/class/overrideToString.jav
deleted file mode 100644
index e2aae14da6c..00000000000
--- a/tests/testData/ast/enum/class/overrideToString.jav
+++ /dev/null
@@ -1 +0,0 @@
-enum Color { WHITE, BLACK, RED, YELLOW, BLUE;@Override String toString() {  return "COLOR";}}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/overrideToString.kt b/tests/testData/ast/enum/class/overrideToString.kt
deleted file mode 100644
index a5653e82eac..00000000000
--- a/tests/testData/ast/enum/class/overrideToString.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-enum class Color {
-WHITE
-BLACK
-RED
-YELLOW
-BLUE
-override fun toString() : String? {
-return "COLOR"
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/primaryPrivateConstructor.jav b/tests/testData/ast/enum/class/primaryPrivateConstructor.jav
deleted file mode 100644
index 7dad6bb265e..00000000000
--- a/tests/testData/ast/enum/class/primaryPrivateConstructor.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-package demo;
-
-enum Color {
- private int code;
-
- private Color(int c) {
-   code = c;
- }
-
- public int getCode() {
-   return code;
- }
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/primaryPrivateConstructor.kt b/tests/testData/ast/enum/class/primaryPrivateConstructor.kt
deleted file mode 100644
index b860f61eeed..00000000000
--- a/tests/testData/ast/enum/class/primaryPrivateConstructor.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package demo
-enum class Color(c : Int) {
-private var code : Int = 0
-public fun getCode() : Int {
-return code
-}
-{
-code = c
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/privateEnum.jav b/tests/testData/ast/enum/class/privateEnum.jav
deleted file mode 100644
index 963b14059d8..00000000000
--- a/tests/testData/ast/enum/class/privateEnum.jav
+++ /dev/null
@@ -1 +0,0 @@
-private enum Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/privateEnum.kt b/tests/testData/ast/enum/class/privateEnum.kt
deleted file mode 100644
index a3a71c70855..00000000000
--- a/tests/testData/ast/enum/class/privateEnum.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-private enum class Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/protectedEnum.jav b/tests/testData/ast/enum/class/protectedEnum.jav
deleted file mode 100644
index 1361563477c..00000000000
--- a/tests/testData/ast/enum/class/protectedEnum.jav
+++ /dev/null
@@ -1 +0,0 @@
-protected enum Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/protectedEnum.kt b/tests/testData/ast/enum/class/protectedEnum.kt
deleted file mode 100644
index 586bab108fd..00000000000
--- a/tests/testData/ast/enum/class/protectedEnum.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-protected enum class Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/publicEnum.jav b/tests/testData/ast/enum/class/publicEnum.jav
deleted file mode 100644
index 23365fc3853..00000000000
--- a/tests/testData/ast/enum/class/publicEnum.jav
+++ /dev/null
@@ -1 +0,0 @@
-public enum Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/publicEnum.kt b/tests/testData/ast/enum/class/publicEnum.kt
deleted file mode 100644
index 4ef7f4c4c6b..00000000000
--- a/tests/testData/ast/enum/class/publicEnum.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-public enum class Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/runnableImplementation.jav b/tests/testData/ast/enum/class/runnableImplementation.jav
deleted file mode 100644
index 5db856671ca..00000000000
--- a/tests/testData/ast/enum/class/runnableImplementation.jav
+++ /dev/null
@@ -1,8 +0,0 @@
-enum Color implements Runnable {
-  WHITE, BLACK, RED, YELLOW, BLUE;
-
-  public void run() {
-   System.out.println("name()=" + name() +
-       ", toString()=" + toString());
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/runnableImplementation.kt b/tests/testData/ast/enum/class/runnableImplementation.kt
deleted file mode 100644
index dbcd73d4440..00000000000
--- a/tests/testData/ast/enum/class/runnableImplementation.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-enum class Color : Runnable {
-WHITE
-BLACK
-RED
-YELLOW
-BLUE
-public override fun run() : Unit {
-System.out?.println("name()=" + name() + ", toString()=" + toString())
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/typeSafeEnum.jav b/tests/testData/ast/enum/class/typeSafeEnum.jav
deleted file mode 100644
index 1ecc70526e4..00000000000
--- a/tests/testData/ast/enum/class/typeSafeEnum.jav
+++ /dev/null
@@ -1 +0,0 @@
-enum Coin { PENNY, NICKEL, DIME, QUARTER; }
\ No newline at end of file
diff --git a/tests/testData/ast/enum/class/typeSafeEnum.kt b/tests/testData/ast/enum/class/typeSafeEnum.kt
deleted file mode 100644
index 7d80ec0ac2f..00000000000
--- a/tests/testData/ast/enum/class/typeSafeEnum.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-enum class Coin {
-PENNY
-NICKEL
-DIME
-QUARTER
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/classChildExtendsBase.jav b/tests/testData/ast/field/file/classChildExtendsBase.jav
deleted file mode 100644
index 94d40fbfea4..00000000000
--- a/tests/testData/ast/field/file/classChildExtendsBase.jav
+++ /dev/null
@@ -1,7 +0,0 @@
-class Base {
-  private String myFirst;
-}
-
-class Child extends Base {
-  private String mySecond;
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/classChildExtendsBase.kt b/tests/testData/ast/field/file/classChildExtendsBase.kt
deleted file mode 100644
index 17681369b0b..00000000000
--- a/tests/testData/ast/field/file/classChildExtendsBase.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-open class Base() {
-private var myFirst : String? = null
-}
-open class Child() : Base() {
-private var mySecond : String? = null
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/internalField.jav b/tests/testData/ast/field/file/internalField.jav
deleted file mode 100644
index 3c3f6a6f633..00000000000
--- a/tests/testData/ast/field/file/internalField.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-Foo f;
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/internalField.kt b/tests/testData/ast/field/file/internalField.kt
deleted file mode 100644
index 5cd1a6ac9a9..00000000000
--- a/tests/testData/ast/field/file/internalField.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class C() {
-var f : Foo? = null
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/privateField.jav b/tests/testData/ast/field/file/privateField.jav
deleted file mode 100644
index 958031a23b4..00000000000
--- a/tests/testData/ast/field/file/privateField.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-private Foo f;
-}
diff --git a/tests/testData/ast/field/file/privateField.kt b/tests/testData/ast/field/file/privateField.kt
deleted file mode 100644
index b2441bf0c24..00000000000
--- a/tests/testData/ast/field/file/privateField.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class C() {
-private var f : Foo? = null
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/protectedField.jav b/tests/testData/ast/field/file/protectedField.jav
deleted file mode 100644
index 100199e107f..00000000000
--- a/tests/testData/ast/field/file/protectedField.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-protected Foo f;
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/protectedField.kt b/tests/testData/ast/field/file/protectedField.kt
deleted file mode 100644
index cba6200d896..00000000000
--- a/tests/testData/ast/field/file/protectedField.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class C() {
-protected var f : Foo? = null
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/publicField.jav b/tests/testData/ast/field/file/publicField.jav
deleted file mode 100644
index 1944ff6914a..00000000000
--- a/tests/testData/ast/field/file/publicField.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-public Foo f;
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/publicField.kt b/tests/testData/ast/field/file/publicField.kt
deleted file mode 100644
index c79b38d6c5c..00000000000
--- a/tests/testData/ast/field/file/publicField.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class C() {
-public var f : Foo? = null
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/valWithInit.jav b/tests/testData/ast/field/file/valWithInit.jav
deleted file mode 100644
index 4e007d357ce..00000000000
--- a/tests/testData/ast/field/file/valWithInit.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-final Foo f = new Foo(1, 2);
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/valWithInit.kt b/tests/testData/ast/field/file/valWithInit.kt
deleted file mode 100644
index b311ebb6784..00000000000
--- a/tests/testData/ast/field/file/valWithInit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class C() {
-val f : Foo = Foo(1, 2)
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/varWithInit.jav b/tests/testData/ast/field/file/varWithInit.jav
deleted file mode 100644
index 07f05b3bc3f..00000000000
--- a/tests/testData/ast/field/file/varWithInit.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-Foo f = new Foo(1, 2);
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/varWithInit.kt b/tests/testData/ast/field/file/varWithInit.kt
deleted file mode 100644
index 6d8dfd2b64c..00000000000
--- a/tests/testData/ast/field/file/varWithInit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class C() {
-var f : Foo? = Foo(1, 2)
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/varWithoutInit.jav b/tests/testData/ast/field/file/varWithoutInit.jav
deleted file mode 100644
index 3c3f6a6f633..00000000000
--- a/tests/testData/ast/field/file/varWithoutInit.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-Foo f;
-}
\ No newline at end of file
diff --git a/tests/testData/ast/field/file/varWithoutInit.kt b/tests/testData/ast/field/file/varWithoutInit.kt
deleted file mode 100644
index 5cd1a6ac9a9..00000000000
--- a/tests/testData/ast/field/file/varWithoutInit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class C() {
-var f : Foo? = null
-}
\ No newline at end of file
diff --git a/tests/testData/ast/file/comp/intNullability.jav b/tests/testData/ast/file/comp/intNullability.jav
deleted file mode 100644
index 328d9cb6ee2..00000000000
--- a/tests/testData/ast/file/comp/intNullability.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo;
-
-class Test {
-  void test() {
-    Integer i = 10;
-    Integer j = 10;
-    System.out.println(i + j);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/file/comp/intNullability.kt b/tests/testData/ast/file/comp/intNullability.kt
deleted file mode 100644
index e3e6c4ca889..00000000000
--- a/tests/testData/ast/file/comp/intNullability.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo
-import kotlin.compatibility.*
-open class Test() {
-open fun test() : Unit {
-var i : Int? = 10
-var j : Int? = 10
-System.out?.println(i!! + j!!)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithClass.jav b/tests/testData/ast/file/file/packageWithClass.jav
deleted file mode 100644
index 3524ce7525c..00000000000
--- a/tests/testData/ast/file/file/packageWithClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-package test; final class C {}
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithClass.kt b/tests/testData/ast/file/file/packageWithClass.kt
deleted file mode 100644
index 3f205654c0b..00000000000
--- a/tests/testData/ast/file/file/packageWithClass.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-class C() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithClasses.jav b/tests/testData/ast/file/file/packageWithClasses.jav
deleted file mode 100644
index d0964b8ccb5..00000000000
--- a/tests/testData/ast/file/file/packageWithClasses.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class A {} final class B {}
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithClasses.kt b/tests/testData/ast/file/file/packageWithClasses.kt
deleted file mode 100644
index 4ed94efde09..00000000000
--- a/tests/testData/ast/file/file/packageWithClasses.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class A() {
-}
-class B() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithImports.jav b/tests/testData/ast/file/file/packageWithImports.jav
deleted file mode 100644
index 94a969cfe93..00000000000
--- a/tests/testData/ast/file/file/packageWithImports.jav
+++ /dev/null
@@ -1 +0,0 @@
-package test;import ast;import ast2;
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithImports.kt b/tests/testData/ast/file/file/packageWithImports.kt
deleted file mode 100644
index d646d02ccc0..00000000000
--- a/tests/testData/ast/file/file/packageWithImports.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-import ast
-import ast2
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithMixedImports.jav b/tests/testData/ast/file/file/packageWithMixedImports.jav
deleted file mode 100644
index 6296e224258..00000000000
--- a/tests/testData/ast/file/file/packageWithMixedImports.jav
+++ /dev/null
@@ -1 +0,0 @@
-package test;import static ast;import ast2;
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithMixedImports.kt b/tests/testData/ast/file/file/packageWithMixedImports.kt
deleted file mode 100644
index d646d02ccc0..00000000000
--- a/tests/testData/ast/file/file/packageWithMixedImports.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-import ast
-import ast2
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithOpenClass.jav b/tests/testData/ast/file/file/packageWithOpenClass.jav
deleted file mode 100644
index 821bbec2b3d..00000000000
--- a/tests/testData/ast/file/file/packageWithOpenClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-package test; class C {}
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithOpenClass.kt b/tests/testData/ast/file/file/packageWithOpenClass.kt
deleted file mode 100644
index d4336ffcc51..00000000000
--- a/tests/testData/ast/file/file/packageWithOpenClass.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-open class C() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithStaticImports.jav b/tests/testData/ast/file/file/packageWithStaticImports.jav
deleted file mode 100644
index 0d1bea3ba5a..00000000000
--- a/tests/testData/ast/file/file/packageWithStaticImports.jav
+++ /dev/null
@@ -1 +0,0 @@
-package test;import static ast;import static ast2;
\ No newline at end of file
diff --git a/tests/testData/ast/file/file/packageWithStaticImports.kt b/tests/testData/ast/file/file/packageWithStaticImports.kt
deleted file mode 100644
index d646d02ccc0..00000000000
--- a/tests/testData/ast/file/file/packageWithStaticImports.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-import ast
-import ast2
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/commonCaseForTest.jav b/tests/testData/ast/for/statement/commonCaseForTest.jav
deleted file mode 100644
index 0ea98e4b45f..00000000000
--- a/tests/testData/ast/for/statement/commonCaseForTest.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (init(); condition(); update()) body();
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/commonCaseForTest.kt b/tests/testData/ast/for/statement/commonCaseForTest.kt
deleted file mode 100644
index 0fab59caf33..00000000000
--- a/tests/testData/ast/for/statement/commonCaseForTest.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-init()
-while (condition())
-{
-body()
-{
-update()
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forRangeWithLE.jav b/tests/testData/ast/for/statement/forRangeWithLE.jav
deleted file mode 100644
index a0069d48943..00000000000
--- a/tests/testData/ast/for/statement/forRangeWithLE.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-int[] array = new int[10];
-for (int i = 0; i <= 10; i++) {array[i] = i;}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forRangeWithLE.kt b/tests/testData/ast/for/statement/forRangeWithLE.kt
deleted file mode 100644
index 79c11ab6288..00000000000
--- a/tests/testData/ast/for/statement/forRangeWithLE.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-var array : IntArray? = IntArray(10)
-for (i in 0..10) {
-array[i] = i
-}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forRangeWithLT.jav b/tests/testData/ast/for/statement/forRangeWithLT.jav
deleted file mode 100644
index 19b24cf03fb..00000000000
--- a/tests/testData/ast/for/statement/forRangeWithLT.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-int[] array = new int[10];
-for (int i = 0; i < 10; i++) {array[i] = i;}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forRangeWithLT.kt b/tests/testData/ast/for/statement/forRangeWithLT.kt
deleted file mode 100644
index f31b904afa4..00000000000
--- a/tests/testData/ast/for/statement/forRangeWithLT.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-var array : IntArray? = IntArray(10)
-for (i in 0..10 - 1) {
-array[i] = i
-}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithBlock.jav b/tests/testData/ast/for/statement/forWithBlock.jav
deleted file mode 100644
index 19b24cf03fb..00000000000
--- a/tests/testData/ast/for/statement/forWithBlock.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-int[] array = new int[10];
-for (int i = 0; i < 10; i++) {array[i] = i;}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithBlock.kt b/tests/testData/ast/for/statement/forWithBlock.kt
deleted file mode 100644
index f31b904afa4..00000000000
--- a/tests/testData/ast/for/statement/forWithBlock.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-var array : IntArray? = IntArray(10)
-for (i in 0..10 - 1) {
-array[i] = i
-}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav b/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav
deleted file mode 100644
index 6c7c9e0e210..00000000000
--- a/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (int i = 0; i < 0; j++, i++) {int i = 1; i++;}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt b/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt
deleted file mode 100644
index 4fd380f6ffe..00000000000
--- a/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-var i : Int = 0
-while (i < 0)
-{
-{
-var i : Int = 1
-i++
-}
-{
-j++
-i++
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithEmptyBlock.jav b/tests/testData/ast/for/statement/forWithEmptyBlock.jav
deleted file mode 100644
index 35fa13bac7b..00000000000
--- a/tests/testData/ast/for/statement/forWithEmptyBlock.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (int i = 0; i < 0; j++, i++) {}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithEmptyBlock.kt b/tests/testData/ast/for/statement/forWithEmptyBlock.kt
deleted file mode 100644
index a5743d94b32..00000000000
--- a/tests/testData/ast/for/statement/forWithEmptyBlock.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-var i : Int = 0
-while (i < 0)
-{
-{
-}
-{
-j++
-i++
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithExpression.jav b/tests/testData/ast/for/statement/forWithExpression.jav
deleted file mode 100644
index fc006f06703..00000000000
--- a/tests/testData/ast/for/statement/forWithExpression.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (int i = 0; i < 0; i++) t++;
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithExpression.kt b/tests/testData/ast/for/statement/forWithExpression.kt
deleted file mode 100644
index be1826e8d8a..00000000000
--- a/tests/testData/ast/for/statement/forWithExpression.kt
+++ /dev/null
@@ -1 +0,0 @@
-for (i in 0..0 - 1) t++
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithReturn.jav b/tests/testData/ast/for/statement/forWithReturn.jav
deleted file mode 100644
index 9a439dfe876..00000000000
--- a/tests/testData/ast/for/statement/forWithReturn.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (int i = 0; i < 0; j++, i++) return i;
\ No newline at end of file
diff --git a/tests/testData/ast/for/statement/forWithReturn.kt b/tests/testData/ast/for/statement/forWithReturn.kt
deleted file mode 100644
index 1c9a6cb9016..00000000000
--- a/tests/testData/ast/for/statement/forWithReturn.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-var i : Int = 0
-while (i < 0)
-{
-return i
-{
-j++
-i++
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav b/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav
deleted file mode 100644
index 8657e2d8f9c..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (Node n : list) {int i = 1; i++;}
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt b/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
deleted file mode 100644
index 43cfc79c100..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-for (n : Node? in list)
-{
-var i : Int = 1
-i++
-}
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav b/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav
deleted file mode 100644
index 225aecfb59c..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (Node n : list) {}
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt b/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt
deleted file mode 100644
index 96f7cee4323..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-for (n : Node? in list)
-{
-}
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav b/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav
deleted file mode 100644
index 22e30e2879e..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (Node n : list) i++;
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt b/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
deleted file mode 100644
index 7affa022577..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-for (n : Node? in list)
-i++
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav b/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav
deleted file mode 100644
index 59409790376..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (Node n : list) return n;
\ No newline at end of file
diff --git a/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt b/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt
deleted file mode 100644
index cb66b9552f4..00000000000
--- a/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-for (n : Node? in list)
-return n
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav b/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav
deleted file mode 100644
index b72fd76ec71..00000000000
--- a/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav
+++ /dev/null
@@ -1,55 +0,0 @@
-package test;
-
-class Test extends Base {
-  @Override
-  public int hashCode() {
-    return super.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    return super.equals(o);
-  }
-
-  @Override
-  protected Object clone() throws CloneNotSupportedException {
-    return super.clone();
-  }
-
-  @Override
-  public String toString() {
-    return super.toString();
-  }
-
-  @Override
-  protected void finalize() throws Throwable {
-    super.finalize();
-  }
-}
-
-class Base {
-  @Override
-  public int hashCode() {
-    return super.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    return super.equals(o);
-  }
-
-  @Override
-  protected Object clone() throws CloneNotSupportedException {
-    return super.clone();
-  }
-
-  @Override
-  public String toString() {
-    return super.toString();
-  }
-
-  @Override
-  protected void finalize() throws Throwable {
-    super.finalize();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt b/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
deleted file mode 100644
index 491c63b601e..00000000000
--- a/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package test
-open class Test() : Base() {
-public override fun hashCode() : Int {
-return super.hashCode()
-}
-public override fun equals(o : Any?) : Boolean {
-return super.equals(o)
-}
-protected override fun clone() : Any? {
-return super.clone()
-}
-public override fun toString() : String? {
-return super.toString()
-}
-protected override fun finalize() : Unit {
-super.finalize()
-}
-}
-open class Base() {
-public open fun hashCode() : Int {
-return System.identityHashCode(this)
-}
-public open fun equals(o : Any?) : Boolean {
-return this.identityEquals(o)
-}
-protected open fun clone() : Any? {
-return super.clone()
-}
-public open fun toString() : String? {
-return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
-}
-protected open fun finalize() : Unit {
-super.finalize()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/functionInFinalClass.jav b/tests/testData/ast/function/file/functionInFinalClass.jav
deleted file mode 100644
index e8417401a9a..00000000000
--- a/tests/testData/ast/function/file/functionInFinalClass.jav
+++ /dev/null
@@ -1,5 +0,0 @@
-package demo;
-
-final class Final {
-  void test() {}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/functionInFinalClass.kt b/tests/testData/ast/function/file/functionInFinalClass.kt
deleted file mode 100644
index def36e1f8de..00000000000
--- a/tests/testData/ast/function/file/functionInFinalClass.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package demo
-class Final() {
-fun test() : Unit {
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/override.jav b/tests/testData/ast/function/file/override.jav
deleted file mode 100644
index 63a319a053c..00000000000
--- a/tests/testData/ast/function/file/override.jav
+++ /dev/null
@@ -1 +0,0 @@
-class A {void a() {}} final class B extends A {void a() {}}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/override.kt b/tests/testData/ast/function/file/override.kt
deleted file mode 100644
index d895be5bb27..00000000000
--- a/tests/testData/ast/function/file/override.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-open class A() {
-open fun a() : Unit {
-}
-}
-class B() : A() {
-override fun a() : Unit {
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/overrideAndOpen.jav b/tests/testData/ast/function/file/overrideAndOpen.jav
deleted file mode 100644
index bda1a410cff..00000000000
--- a/tests/testData/ast/function/file/overrideAndOpen.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-class A {
-  void foo() {}
-}
-
-class B extends A {
-  void foo() {}
-}
-
-class C extends B {
-  void foo() {}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/overrideAndOpen.kt b/tests/testData/ast/function/file/overrideAndOpen.kt
deleted file mode 100644
index 678a37a4a70..00000000000
--- a/tests/testData/ast/function/file/overrideAndOpen.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-open class A() {
-open fun foo() : Unit {
-}
-}
-open class B() : A() {
-override fun foo() : Unit {
-}
-}
-open class C() : B() {
-override fun foo() : Unit {
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/overrideObject.jav b/tests/testData/ast/function/file/overrideObject.jav
deleted file mode 100644
index 0538508c9b8..00000000000
--- a/tests/testData/ast/function/file/overrideObject.jav
+++ /dev/null
@@ -1,28 +0,0 @@
-package test;
-
-class Test {
-  @Override
-  public int hashCode() {
-    return super.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    return super.equals(o);
-  }
-
-  @Override
-  protected Object clone() throws CloneNotSupportedException {
-    return super.clone();
-  }
-
-  @Override
-  public String toString() {
-    return super.toString();
-  }
-
-  @Override
-  protected void finalize() throws Throwable {
-    super.finalize();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/overrideObject.kt b/tests/testData/ast/function/file/overrideObject.kt
deleted file mode 100644
index 55f017c4656..00000000000
--- a/tests/testData/ast/function/file/overrideObject.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package test
-open class Test() {
-public open fun hashCode() : Int {
-return System.identityHashCode(this)
-}
-public open fun equals(o : Any?) : Boolean {
-return this.identityEquals(o)
-}
-protected open fun clone() : Any? {
-return super.clone()
-}
-public open fun toString() : String? {
-return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
-}
-protected open fun finalize() : Unit {
-super.finalize()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/varVararg.jav b/tests/testData/ast/function/file/varVararg.jav
deleted file mode 100644
index bba8ce2db90..00000000000
--- a/tests/testData/ast/function/file/varVararg.jav
+++ /dev/null
@@ -1,7 +0,0 @@
-package demo;
-
-class Test {
-  void test(Object ... args) {
-    args = new Integer[] {1, 2, 3};
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/varVararg.kt b/tests/testData/ast/function/file/varVararg.kt
deleted file mode 100644
index 6d364141a95..00000000000
--- a/tests/testData/ast/function/file/varVararg.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package demo
-open class Test() {
-open fun test(vararg var args : Any?) : Unit {
-args = array<Int?>(1, 2, 3)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/writableParameter.jav b/tests/testData/ast/function/file/writableParameter.jav
deleted file mode 100644
index c2ed3cf10d4..00000000000
--- a/tests/testData/ast/function/file/writableParameter.jav
+++ /dev/null
@@ -1,8 +0,0 @@
-package demo;
-
-class Test {
-  int test(int i) {
-    i = 10;
-    return i + 20;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/file/writableParameter.kt b/tests/testData/ast/function/file/writableParameter.kt
deleted file mode 100644
index b098e657066..00000000000
--- a/tests/testData/ast/function/file/writableParameter.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package demo
-open class Test() {
-open fun test(var i : Int) : Int {
-i = 10
-return i + 20
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/abstractMethod.jav b/tests/testData/ast/function/method/abstractMethod.jav
deleted file mode 100644
index 03a2e8270c8..00000000000
--- a/tests/testData/ast/function/method/abstractMethod.jav
+++ /dev/null
@@ -1 +0,0 @@
-abstract int getNoofGears();
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/abstractMethod.kt b/tests/testData/ast/function/method/abstractMethod.kt
deleted file mode 100644
index 8163dfad9bb..00000000000
--- a/tests/testData/ast/function/method/abstractMethod.kt
+++ /dev/null
@@ -1 +0,0 @@
-abstract fun getNoofGears() : Int
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/classGenericParam.jav b/tests/testData/ast/function/method/classGenericParam.jav
deleted file mode 100644
index ec2f1534b58..00000000000
--- a/tests/testData/ast/function/method/classGenericParam.jav
+++ /dev/null
@@ -1 +0,0 @@
-T getT() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/classGenericParam.kt b/tests/testData/ast/function/method/classGenericParam.kt
deleted file mode 100644
index b9ea1d49799..00000000000
--- a/tests/testData/ast/function/method/classGenericParam.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun getT() : T? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/emptyVoidMethod.jav b/tests/testData/ast/function/method/emptyVoidMethod.jav
deleted file mode 100644
index 05a37e98348..00000000000
--- a/tests/testData/ast/function/method/emptyVoidMethod.jav
+++ /dev/null
@@ -1 +0,0 @@
-void main() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/emptyVoidMethod.kt b/tests/testData/ast/function/method/emptyVoidMethod.kt
deleted file mode 100644
index ae299eb173a..00000000000
--- a/tests/testData/ast/function/method/emptyVoidMethod.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun main() : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/final.jav b/tests/testData/ast/function/method/final.jav
deleted file mode 100644
index 8a49597af12..00000000000
--- a/tests/testData/ast/function/method/final.jav
+++ /dev/null
@@ -1 +0,0 @@
-final String getString() { return ""; }
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/final.kt b/tests/testData/ast/function/method/final.kt
deleted file mode 100644
index e6cf12b2b3f..00000000000
--- a/tests/testData/ast/function/method/final.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun getString() : String? {
-return ""
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/internal.jav b/tests/testData/ast/function/method/internal.jav
deleted file mode 100644
index 48b8cb32a8b..00000000000
--- a/tests/testData/ast/function/method/internal.jav
+++ /dev/null
@@ -1 +0,0 @@
-void test() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/internal.kt b/tests/testData/ast/function/method/internal.kt
deleted file mode 100644
index 5b3e9634f3f..00000000000
--- a/tests/testData/ast/function/method/internal.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun test() : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/main.jav b/tests/testData/ast/function/method/main.jav
deleted file mode 100644
index a03c0afe12f..00000000000
--- a/tests/testData/ast/function/method/main.jav
+++ /dev/null
@@ -1 +0,0 @@
-public static void main(String[] args) {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/main.kt b/tests/testData/ast/function/method/main.kt
deleted file mode 100644
index 164c099f986..00000000000
--- a/tests/testData/ast/function/method/main.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class object {
-public fun main(args : Array<String?>?) : Unit {
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodClassType.jav b/tests/testData/ast/function/method/methodClassType.jav
deleted file mode 100644
index ad93979b6fc..00000000000
--- a/tests/testData/ast/function/method/methodClassType.jav
+++ /dev/null
@@ -1 +0,0 @@
-String main() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodClassType.kt b/tests/testData/ast/function/method/methodClassType.kt
deleted file mode 100644
index 196c45b6bf8..00000000000
--- a/tests/testData/ast/function/method/methodClassType.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun main() : String? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodPrimitiveType.jav b/tests/testData/ast/function/method/methodPrimitiveType.jav
deleted file mode 100644
index c272dabaeb6..00000000000
--- a/tests/testData/ast/function/method/methodPrimitiveType.jav
+++ /dev/null
@@ -1 +0,0 @@
-int main() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodPrimitiveType.kt b/tests/testData/ast/function/method/methodPrimitiveType.kt
deleted file mode 100644
index c6ef43f8a14..00000000000
--- a/tests/testData/ast/function/method/methodPrimitiveType.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun main() : Int {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodPrimitiveType2.jav b/tests/testData/ast/function/method/methodPrimitiveType2.jav
deleted file mode 100644
index 0539f74aaef..00000000000
--- a/tests/testData/ast/function/method/methodPrimitiveType2.jav
+++ /dev/null
@@ -1 +0,0 @@
-boolean main() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodPrimitiveType2.kt b/tests/testData/ast/function/method/methodPrimitiveType2.kt
deleted file mode 100644
index c978e93e7aa..00000000000
--- a/tests/testData/ast/function/method/methodPrimitiveType2.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun main() : Boolean {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodWithReturnStatement.jav b/tests/testData/ast/function/method/methodWithReturnStatement.jav
deleted file mode 100644
index 1b02cbaa290..00000000000
--- a/tests/testData/ast/function/method/methodWithReturnStatement.jav
+++ /dev/null
@@ -1 +0,0 @@
-boolean isTrue() { return true; }
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/methodWithReturnStatement.kt b/tests/testData/ast/function/method/methodWithReturnStatement.kt
deleted file mode 100644
index acfbd1010d8..00000000000
--- a/tests/testData/ast/function/method/methodWithReturnStatement.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun isTrue() : Boolean {
-return true
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/open.jav b/tests/testData/ast/function/method/open.jav
deleted file mode 100644
index 6db748fef42..00000000000
--- a/tests/testData/ast/function/method/open.jav
+++ /dev/null
@@ -1 +0,0 @@
-String getString() { return ""; }
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/open.kt b/tests/testData/ast/function/method/open.kt
deleted file mode 100644
index e6cf12b2b3f..00000000000
--- a/tests/testData/ast/function/method/open.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun getString() : String? {
-return ""
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/ownGenericParam.jav b/tests/testData/ast/function/method/ownGenericParam.jav
deleted file mode 100644
index 3b651cfda09..00000000000
--- a/tests/testData/ast/function/method/ownGenericParam.jav
+++ /dev/null
@@ -1 +0,0 @@
-<U> void putU(U u) {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/ownGenericParam.kt b/tests/testData/ast/function/method/ownGenericParam.kt
deleted file mode 100644
index e5533fdcb5f..00000000000
--- a/tests/testData/ast/function/method/ownGenericParam.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun putU<U>(u : U?) : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/ownSeveralGenericParams.jav b/tests/testData/ast/function/method/ownSeveralGenericParams.jav
deleted file mode 100644
index 3af41393000..00000000000
--- a/tests/testData/ast/function/method/ownSeveralGenericParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-<U, V, W> void putUVW(U u, V v, W w) {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/ownSeveralGenericParams.kt b/tests/testData/ast/function/method/ownSeveralGenericParams.kt
deleted file mode 100644
index 19fb6188681..00000000000
--- a/tests/testData/ast/function/method/ownSeveralGenericParams.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun putUVW<U, V, W>(u : U?, v : V?, w : W?) : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/private.jav b/tests/testData/ast/function/method/private.jav
deleted file mode 100644
index 823fbd1e89e..00000000000
--- a/tests/testData/ast/function/method/private.jav
+++ /dev/null
@@ -1 +0,0 @@
-private void test() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/private.kt b/tests/testData/ast/function/method/private.kt
deleted file mode 100644
index 45e5e8bab00..00000000000
--- a/tests/testData/ast/function/method/private.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-private fun test() : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/protected.jav b/tests/testData/ast/function/method/protected.jav
deleted file mode 100644
index ab7575a6ed6..00000000000
--- a/tests/testData/ast/function/method/protected.jav
+++ /dev/null
@@ -1 +0,0 @@
-protected void test() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/protected.kt b/tests/testData/ast/function/method/protected.kt
deleted file mode 100644
index dbbc30b447b..00000000000
--- a/tests/testData/ast/function/method/protected.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-protected fun test() : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/public.jav b/tests/testData/ast/function/method/public.jav
deleted file mode 100644
index db620e22298..00000000000
--- a/tests/testData/ast/function/method/public.jav
+++ /dev/null
@@ -1 +0,0 @@
-public void test() {}
\ No newline at end of file
diff --git a/tests/testData/ast/function/method/public.kt b/tests/testData/ast/function/method/public.kt
deleted file mode 100644
index d835330ec86..00000000000
--- a/tests/testData/ast/function/method/public.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-public fun test() : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/identifier/expression/withDollar.jav b/tests/testData/ast/identifier/expression/withDollar.jav
deleted file mode 100644
index 49ceb94e5b8..00000000000
--- a/tests/testData/ast/identifier/expression/withDollar.jav
+++ /dev/null
@@ -1 +0,0 @@
-$$$$$
\ No newline at end of file
diff --git a/tests/testData/ast/identifier/expression/withDollar.kt b/tests/testData/ast/identifier/expression/withDollar.kt
deleted file mode 100644
index 47ac2104db8..00000000000
--- a/tests/testData/ast/identifier/expression/withDollar.kt
+++ /dev/null
@@ -1 +0,0 @@
-`$$$$$`
\ No newline at end of file
diff --git a/tests/testData/ast/identifier/file/finalFieldReference.jav b/tests/testData/ast/identifier/file/finalFieldReference.jav
deleted file mode 100644
index f5d31f19d64..00000000000
--- a/tests/testData/ast/identifier/file/finalFieldReference.jav
+++ /dev/null
@@ -1,13 +0,0 @@
-class $$$$$ {}
-
-class $ {}
-
-class $$ extends $ {
-  final $$$$$ $$$;
-
-  public $$($$$$$ $$$$) {
-    $$$ = $$$$;
-  }
-  
-  public $$$$$ $$$$$$() {return $$$;}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/identifier/file/finalFieldReference.kt b/tests/testData/ast/identifier/file/finalFieldReference.kt
deleted file mode 100644
index 3e5423839fb..00000000000
--- a/tests/testData/ast/identifier/file/finalFieldReference.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-open class `$$$$$`() {
-}
-open class `$`() {
-}
-open class `$$`(`$$$$` : `$$$$$`?) : `$`() {
-val `$$$` : `$$$$$`?
-public open fun `$$$$$$`() : `$$$$$`? {
-return `$$$`
-}
-{
-`$$$` = `$$$$`
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/identifier/statement/keywords.jav b/tests/testData/ast/identifier/statement/keywords.jav
deleted file mode 100644
index 02a6d77d21a..00000000000
--- a/tests/testData/ast/identifier/statement/keywords.jav
+++ /dev/null
@@ -1 +0,0 @@
-int as, type, val, var, fun, is, in, object, when, trait, This;
\ No newline at end of file
diff --git a/tests/testData/ast/identifier/statement/keywords.kt b/tests/testData/ast/identifier/statement/keywords.kt
deleted file mode 100644
index 5395a402d72..00000000000
--- a/tests/testData/ast/identifier/statement/keywords.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-var `as` : Int
-var `type` : Int
-var `val` : Int
-var `var` : Int
-var `fun` : Int
-var `is` : Int
-var `in` : Int
-var `object` : Int
-var `when` : Int
-var `trait` : Int
-var `This` : Int
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav b/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav
deleted file mode 100644
index 3690c79ad62..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav
+++ /dev/null
@@ -1 +0,0 @@
-if (1 > 0) {} else {}
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt b/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
deleted file mode 100644
index 4587b89bf1e..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-if (1 > 0)
-{
-}
-else
-{
-}
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav b/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav
deleted file mode 100644
index 5546ee07bcf..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav
+++ /dev/null
@@ -1 +0,0 @@
-if (1 > 0) {int n = 1; return n;} else {return 0;}
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt b/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
deleted file mode 100644
index 41cfc10ac2d..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-if (1 > 0)
-{
-var n : Int = 1
-return n
-}
-else
-{
-return 0
-}
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav b/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav
deleted file mode 100644
index c772469d2d2..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav
+++ /dev/null
@@ -1 +0,0 @@
-if (true) return 1; else return 0;
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt b/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt
deleted file mode 100644
index 923c0d36318..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-if (true)
-return 1
-else
-return 0
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav b/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav
deleted file mode 100644
index d4814fbe107..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav
+++ /dev/null
@@ -1 +0,0 @@
-if (1 > 0) {int n = 1; return n;}
\ No newline at end of file
diff --git a/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt b/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
deleted file mode 100644
index a63a714b79c..00000000000
--- a/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-if (1 > 0)
-{
-var n : Int = 1
-return n
-}
\ No newline at end of file
diff --git a/tests/testData/ast/importStatement/file/importWithKeywords.jav b/tests/testData/ast/importStatement/file/importWithKeywords.jav
deleted file mode 100644
index 5b4e73fec5a..00000000000
--- a/tests/testData/ast/importStatement/file/importWithKeywords.jav
+++ /dev/null
@@ -1,5 +0,0 @@
-package test;
-
-import as.type.val.var.fun.is.in.object.when.trait.This;
-
-class Test {}
diff --git a/tests/testData/ast/importStatement/file/importWithKeywords.kt b/tests/testData/ast/importStatement/file/importWithKeywords.kt
deleted file mode 100644
index 63b5935201f..00000000000
--- a/tests/testData/ast/importStatement/file/importWithKeywords.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
-open class Test() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/importStatement/file/importWithStar.jav b/tests/testData/ast/importStatement/file/importWithStar.jav
deleted file mode 100644
index abbec8d10d3..00000000000
--- a/tests/testData/ast/importStatement/file/importWithStar.jav
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.jetbrains.jet.j2k;
-
-import org.jetbrains.annotations.*;
-
-public class Converter {}
\ No newline at end of file
diff --git a/tests/testData/ast/importStatement/file/importWithStar.kt b/tests/testData/ast/importStatement/file/importWithStar.kt
deleted file mode 100644
index c390c539acc..00000000000
--- a/tests/testData/ast/importStatement/file/importWithStar.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.jetbrains.jet.j2k
-import org.jetbrains.annotations.*
-public open class Converter() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/importStatement/file/simpleImport.jav b/tests/testData/ast/importStatement/file/simpleImport.jav
deleted file mode 100644
index a2daf0cd933..00000000000
--- a/tests/testData/ast/importStatement/file/simpleImport.jav
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.jetbrains.jet.j2k;
-
-import org.jetbrains.annotations.NotNull;
-
-public class Converter {}
\ No newline at end of file
diff --git a/tests/testData/ast/importStatement/file/simpleImport.kt b/tests/testData/ast/importStatement/file/simpleImport.kt
deleted file mode 100644
index c35720004e5..00000000000
--- a/tests/testData/ast/importStatement/file/simpleImport.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.jetbrains.jet.j2k
-public open class Converter() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inProjectionType/method/methodParams.jav b/tests/testData/ast/inProjectionType/method/methodParams.jav
deleted file mode 100644
index 63b9ff6d6b7..00000000000
--- a/tests/testData/ast/inProjectionType/method/methodParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-void popAll(Collection<? super E> dst) {}
\ No newline at end of file
diff --git a/tests/testData/ast/inProjectionType/method/methodParams.kt b/tests/testData/ast/inProjectionType/method/methodParams.kt
deleted file mode 100644
index 6888dcd5c36..00000000000
--- a/tests/testData/ast/inProjectionType/method/methodParams.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun popAll(dst : Collection<in E?>?) : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav b/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav
deleted file mode 100644
index 0abe463c9ae..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-class Base<T> {
-  Base(T name) { }
-}
-
-class One<T, K> extends Base<T> {
-  private K mySecond;
-
-  One(T name, K second) {
-    super(name)
-    mySecond = second;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt b/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt
deleted file mode 100644
index a324e8503b5..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-open class Base<T>(name : T?) {
-}
-open class One<T, K>(name : T?, second : K?) : Base<T?>(name) {
-private var mySecond : K? = null
-{
-mySecond = second
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav b/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav
deleted file mode 100644
index 9e7190d29fa..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-class Base {
-  Base(String name) {}
-}
-
-class One extends Base {
-  One(String name, String second) {
-    super(name)
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt b/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt
deleted file mode 100644
index 3e82be38c5c..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-open class Base(name : String?) {
-}
-open class One(name : String?, second : String?) : Base(name) {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav b/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav
deleted file mode 100644
index 2a89c5bd6e0..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav
+++ /dev/null
@@ -1,3 +0,0 @@
-class Base {}
-
-class One extends Base {}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt b/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt
deleted file mode 100644
index 94f907016db..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-open class Base() {
-}
-open class One() : Base() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav b/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav
deleted file mode 100644
index 94f530c95a1..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav
+++ /dev/null
@@ -1,13 +0,0 @@
-class Base {
-  Base(String name) {
-  }
-}
-
-class One extends Base {
-  private String mySecond;
-
-  One(String name, String second) {
-    super(name);
-    mySecond = second;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
deleted file mode 100644
index cd9b7f3b8e9..00000000000
--- a/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-open class Base(name : String?) {
-}
-open class One(name : String?, second : String?) : Base(name) {
-private var mySecond : String? = null
-{
-mySecond = second
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/isOperator/expression/complicatedExpression.jav b/tests/testData/ast/isOperator/expression/complicatedExpression.jav
deleted file mode 100644
index 8840a8af77b..00000000000
--- a/tests/testData/ast/isOperator/expression/complicatedExpression.jav
+++ /dev/null
@@ -1 +0,0 @@
-c.getType().getName() instanceof String
\ No newline at end of file
diff --git a/tests/testData/ast/isOperator/expression/complicatedExpression.kt b/tests/testData/ast/isOperator/expression/complicatedExpression.kt
deleted file mode 100644
index 1cf2e9ebc79..00000000000
--- a/tests/testData/ast/isOperator/expression/complicatedExpression.kt
+++ /dev/null
@@ -1 +0,0 @@
-c.getType().getName() is String
\ No newline at end of file
diff --git a/tests/testData/ast/isOperator/expression/simpleReference.jav b/tests/testData/ast/isOperator/expression/simpleReference.jav
deleted file mode 100644
index 2cd30e5adf2..00000000000
--- a/tests/testData/ast/isOperator/expression/simpleReference.jav
+++ /dev/null
@@ -1 +0,0 @@
-a instanceof String
\ No newline at end of file
diff --git a/tests/testData/ast/isOperator/expression/simpleReference.kt b/tests/testData/ast/isOperator/expression/simpleReference.kt
deleted file mode 100644
index 7ccaa0c9744..00000000000
--- a/tests/testData/ast/isOperator/expression/simpleReference.kt
+++ /dev/null
@@ -1 +0,0 @@
-a is String
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-1016.jav b/tests/testData/ast/issues/file/kt-1016.jav
deleted file mode 100644
index 2e7b3a85644..00000000000
--- a/tests/testData/ast/issues/file/kt-1016.jav
+++ /dev/null
@@ -1,8 +0,0 @@
-package demo;
-
-class C {
-  private final int i;
-  public C(int i) {
-    this.i = i;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-1016.kt b/tests/testData/ast/issues/file/kt-1016.kt
deleted file mode 100644
index 801abcf6e5a..00000000000
--- a/tests/testData/ast/issues/file/kt-1016.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package demo
-open class C(i : Int) {
-private val i : Int
-{
-this.i = i
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-1048.jav b/tests/testData/ast/issues/file/kt-1048.jav
deleted file mode 100644
index 0b198292616..00000000000
--- a/tests/testData/ast/issues/file/kt-1048.jav
+++ /dev/null
@@ -1,18 +0,0 @@
-import java.util.HashMap;
-
-class G <T extends String> {
-  public <T> G(T t) {
-  }
-}
-
-public class Java {
-    void test() {
-        HashMap m = new HashMap();
-        m.put(1, 1);
-    }
-    void test2() {
-        HashMap<?, ?> m = new HashMap();
-        G g = new G("");
-        G<String> g2 = new G<String>("");
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-1048.kt b/tests/testData/ast/issues/file/kt-1048.kt
deleted file mode 100644
index 69d30dfa1a3..00000000000
--- a/tests/testData/ast/issues/file/kt-1048.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-import java.util.HashMap
-open class G<T : String?>(t : T?) {
-}
-public open class Java() {
-open fun test() : Unit {
-var m : HashMap<Any?, Any?>? = HashMap()
-m?.put(1, 1)
-}
-open fun test2() : Unit {
-var m : HashMap<*, *>? = HashMap()
-var g : G<String?>? = G("")
-var g2 : G<String?>? = G<String?>("")
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-1074.jav b/tests/testData/ast/issues/file/kt-1074.jav
deleted file mode 100644
index 4579da0addc..00000000000
--- a/tests/testData/ast/issues/file/kt-1074.jav
+++ /dev/null
@@ -1,13 +0,0 @@
-package demo;
-
-class Test {
-    static void subListRangeCheck(int fromIndex, int toIndex, int size) {
-        if (fromIndex < 0)
-            throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
-        if (toIndex > size)
-            throw new IndexOutOfBoundsException("toIndex = " + toIndex);
-        if (fromIndex > toIndex)
-            throw new IllegalArgumentException("fromIndex(" + fromIndex
-                    + ") > toIndex(" + toIndex + ")");
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-1074.kt b/tests/testData/ast/issues/file/kt-1074.kt
deleted file mode 100644
index 652697c03b5..00000000000
--- a/tests/testData/ast/issues/file/kt-1074.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package demo
-open class Test() {
-class object {
-open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) : Unit {
-if (fromIndex < 0)
-throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
-if (toIndex > size)
-throw IndexOutOfBoundsException("toIndex = " + toIndex)
-if (fromIndex > toIndex)
-throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")")
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-543-boxed.jav b/tests/testData/ast/issues/file/kt-543-boxed.jav
deleted file mode 100644
index e1f28f04faa..00000000000
--- a/tests/testData/ast/issues/file/kt-543-boxed.jav
+++ /dev/null
@@ -1,13 +0,0 @@
-package demo;
-
-class Test {
-  void putInt(Integer i) {}
-
-  void test() {
-    byte b = 10;
-    putInt(b);
-
-    Byte b2 = 10;
-    putInt(b2);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-543-boxed.kt b/tests/testData/ast/issues/file/kt-543-boxed.kt
deleted file mode 100644
index 2465167cd1d..00000000000
--- a/tests/testData/ast/issues/file/kt-543-boxed.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo
-open class Test() {
-open fun putInt(i : Int?) : Unit {
-}
-open fun test() : Unit {
-var b : Byte = 10
-putInt(b.toInt())
-var b2 : Byte? = 10
-putInt(b2?.toInt())
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-543-mixed.jav b/tests/testData/ast/issues/file/kt-543-mixed.jav
deleted file mode 100644
index 1193a5403bb..00000000000
--- a/tests/testData/ast/issues/file/kt-543-mixed.jav
+++ /dev/null
@@ -1,10 +0,0 @@
-package demo;
-
-class Test {
-  void putInt(Integer i) {}
-
-  void test() {
-    int i = 10;
-    putInt(i);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-543-mixed.kt b/tests/testData/ast/issues/file/kt-543-mixed.kt
deleted file mode 100644
index 566c7766284..00000000000
--- a/tests/testData/ast/issues/file/kt-543-mixed.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo
-open class Test() {
-open fun putInt(i : Int?) : Unit {
-}
-open fun test() : Unit {
-var i : Int = 10
-putInt(i)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-543.jav b/tests/testData/ast/issues/file/kt-543.jav
deleted file mode 100644
index c5e0e602076..00000000000
--- a/tests/testData/ast/issues/file/kt-543.jav
+++ /dev/null
@@ -1,10 +0,0 @@
-package demo;
-
-class Test {
-  void putInt(int i) {}
-
-  void test() {
-    byte b = 10;
-    putInt(b);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-543.kt b/tests/testData/ast/issues/file/kt-543.kt
deleted file mode 100644
index dc9dcb3b7f7..00000000000
--- a/tests/testData/ast/issues/file/kt-543.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo
-open class Test() {
-open fun putInt(i : Int) : Unit {
-}
-open fun test() : Unit {
-var b : Byte = 10
-putInt(b.toInt())
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-638.jav b/tests/testData/ast/issues/file/kt-638.jav
deleted file mode 100644
index 8a5b22477da..00000000000
--- a/tests/testData/ast/issues/file/kt-638.jav
+++ /dev/null
@@ -1,33 +0,0 @@
-public class Identifier<T> {
-  private final T myName;
-  private boolean myHasDollar;
-  private boolean myNullable = true;
-
-  public Identifier(T name) {
-    myName = name;
-  }
-
-  public Identifier(T name, boolean isNullable) {
-    myName = name;
-    myNullable = isNullable;
-  }
-
-  public Identifier(T name, boolean hasDollar, boolean isNullable) {
-    myName = name;
-    myHasDollar = hasDollar;
-    myNullable = isNullable;
-  }
-
-  @Override
-  public T getName() {
-    return myName;
-  }
-}
-
-public class User {
-  public static void main(String[] args) {
-     Identifier<?> i1 = new Identifier<String>("name", false, true);
-     Identifier i2 = new Identifier<String>("name", false);
-     Identifier i3 = new Identifier<String>("name");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-638.kt b/tests/testData/ast/issues/file/kt-638.kt
deleted file mode 100644
index 6a38806f16a..00000000000
--- a/tests/testData/ast/issues/file/kt-638.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
-private val myName : T?
-private var myHasDollar : Boolean = false
-private var myNullable : Boolean = true
-public open fun getName() : T? {
-return myName
-}
-{
-myName = _myName
-myHasDollar = _myHasDollar
-}
-class object {
-public open fun init<T>(name : T?) : Identifier<T> {
-val __ = Identifier(name, false)
-return __
-}
-public open fun init<T>(name : T?, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, false)
-__.myNullable = isNullable
-return __
-}
-public open fun init<T>(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, hasDollar)
-__.myNullable = isNullable
-return __
-}
-}
-}
-public open class User() {
-class object {
-public open fun main(args : Array<String?>?) : Unit {
-var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<*>? = Identifier.init<String?>("name")
-}
-}
-}
-fun main(args : Array<String>) = User.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-696.jav b/tests/testData/ast/issues/file/kt-696.jav
deleted file mode 100644
index 2a03b39aa53..00000000000
--- a/tests/testData/ast/issues/file/kt-696.jav
+++ /dev/null
@@ -1,35 +0,0 @@
-package test;
-
-class Base {
-  @Override
-  public int hashCode() {
-    return super.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    return super.equals(o);
-  }
-
-  @Override
-  public String toString() {
-    return super.toString();
-  }
-}
-
-class Child extends Base {
-  @Override
-  public int hashCode() {
-    return super.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    return super.equals(o);
-  }
-
-  @Override
-  public String toString() {
-    return super.toString();
-  }
-}
diff --git a/tests/testData/ast/issues/file/kt-696.kt b/tests/testData/ast/issues/file/kt-696.kt
deleted file mode 100644
index 173b4205ee4..00000000000
--- a/tests/testData/ast/issues/file/kt-696.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package test
-open class Base() {
-public open fun hashCode() : Int {
-return System.identityHashCode(this)
-}
-public open fun equals(o : Any?) : Boolean {
-return this.identityEquals(o)
-}
-public open fun toString() : String? {
-return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
-}
-}
-open class Child() : Base() {
-public override fun hashCode() : Int {
-return super.hashCode()
-}
-public override fun equals(o : Any?) : Boolean {
-return super.equals(o)
-}
-public override fun toString() : String? {
-return super.toString()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-792-mixed.jav b/tests/testData/ast/issues/file/kt-792-mixed.jav
deleted file mode 100644
index 95fdbca8c1c..00000000000
--- a/tests/testData/ast/issues/file/kt-792-mixed.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo;
-
-class Test {
-  Test(Integer i) {
-  }
-
-  void test() {
-    int i = 10;
-    new Test(i);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-792-mixed.kt b/tests/testData/ast/issues/file/kt-792-mixed.kt
deleted file mode 100644
index fa82740445e..00000000000
--- a/tests/testData/ast/issues/file/kt-792-mixed.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package demo
-open class Test(i : Int?) {
-open fun test() : Unit {
-var i : Int = 10
-Test(i)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-792.jav b/tests/testData/ast/issues/file/kt-792.jav
deleted file mode 100644
index 9c1d1cf00d9..00000000000
--- a/tests/testData/ast/issues/file/kt-792.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo;
-
-class Test {
-  Test(int i) {
-  }
-
-  void test() {
-    byte b = 10;
-    new Test(b);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-792.kt b/tests/testData/ast/issues/file/kt-792.kt
deleted file mode 100644
index 2a6929f3456..00000000000
--- a/tests/testData/ast/issues/file/kt-792.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package demo
-open class Test(i : Int) {
-open fun test() : Unit {
-var b : Byte = 10
-Test(b.toInt())
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-794-mixed.jav b/tests/testData/ast/issues/file/kt-794-mixed.jav
deleted file mode 100644
index d64b41aa5a8..00000000000
--- a/tests/testData/ast/issues/file/kt-794-mixed.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo;
-
-class Test {
-  Integer getInteger(Integer i) {
-    return i;
-  }
-
-  void test() {
-    int i = getInteger(10);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-794-mixed.kt b/tests/testData/ast/issues/file/kt-794-mixed.kt
deleted file mode 100644
index 769c7a2e2bf..00000000000
--- a/tests/testData/ast/issues/file/kt-794-mixed.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo
-open class Test() {
-open fun getInteger(i : Int?) : Int? {
-return i
-}
-open fun test() : Unit {
-var i : Int = getInteger(10)!!
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-794.jav b/tests/testData/ast/issues/file/kt-794.jav
deleted file mode 100644
index 5458bce32ca..00000000000
--- a/tests/testData/ast/issues/file/kt-794.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-class Test {
-  int getInt() {
-    byte b = 10;
-    return b;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-794.kt b/tests/testData/ast/issues/file/kt-794.kt
deleted file mode 100644
index f27c7dcba3e..00000000000
--- a/tests/testData/ast/issues/file/kt-794.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-open class Test() {
-open fun getInt() : Int {
-var b : Byte = 10
-return b.toInt()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-809-string.jav b/tests/testData/ast/issues/file/kt-809-string.jav
deleted file mode 100644
index 5e60a8c8552..00000000000
--- a/tests/testData/ast/issues/file/kt-809-string.jav
+++ /dev/null
@@ -1,21 +0,0 @@
-package demo;
-
-class Container {
-  String myString = "1";
-}
-
-class One {
-  static Container myContainer = new Container();
-}
-
-class StringContainer {
-  StringContainer(String s) {}
-}
-
-class Test {
-  void putString(String s) { }
-  void test() {
-    putString(One.myContainer.myString);
-    new StringContainer(One.myContainer.myString);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-809-string.kt b/tests/testData/ast/issues/file/kt-809-string.kt
deleted file mode 100644
index 9dea26fc2eb..00000000000
--- a/tests/testData/ast/issues/file/kt-809-string.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package demo
-open class Container() {
-var myString : String? = "1"
-}
-open class One() {
-class object {
-var myContainer : Container? = Container()
-}
-}
-open class StringContainer(s : String?) {
-}
-open class Test() {
-open fun putString(s : String?) : Unit {
-}
-open fun test() : Unit {
-putString(One.myContainer?.myString)
-StringContainer(One.myContainer?.myString)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-809.jav b/tests/testData/ast/issues/file/kt-809.jav
deleted file mode 100644
index b2cc8015ee9..00000000000
--- a/tests/testData/ast/issues/file/kt-809.jav
+++ /dev/null
@@ -1,21 +0,0 @@
-package demo;
-
-class Container {
-  int myInt = 1;
-}
-
-class One {
-  static Container myContainer = new Container();
-}
-
-class IntContainer {
-  IntContainer(int i) {}
-}
-
-class Test {
-  void putInt(int i) { }
-  void test() {
-    putInt(One.myContainer.myInt);
-    new IntContainer(One.myContainer.myInt);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-809.kt b/tests/testData/ast/issues/file/kt-809.kt
deleted file mode 100644
index 598912b4016..00000000000
--- a/tests/testData/ast/issues/file/kt-809.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package demo
-open class Container() {
-var myInt : Int = 1
-}
-open class One() {
-class object {
-var myContainer : Container? = Container()
-}
-}
-open class IntContainer(i : Int) {
-}
-open class Test() {
-open fun putInt(i : Int) : Unit {
-}
-open fun test() : Unit {
-putInt(One.myContainer?.myInt!!)
-IntContainer(One.myContainer?.myInt!!)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-820-field.jav b/tests/testData/ast/issues/file/kt-820-field.jav
deleted file mode 100644
index ca2c1588ef7..00000000000
--- a/tests/testData/ast/issues/file/kt-820-field.jav
+++ /dev/null
@@ -1,13 +0,0 @@
-package demo;
-
-class Container {
-  int myInt = 1;
-}
-
-class One {
-  static Container myContainer = new Container();
-}
-
-class Test {
-  byte b = One.myContainer.myInt;
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-820-field.kt b/tests/testData/ast/issues/file/kt-820-field.kt
deleted file mode 100644
index 5f9141abcc7..00000000000
--- a/tests/testData/ast/issues/file/kt-820-field.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package demo
-open class Container() {
-var myInt : Int = 1
-}
-open class One() {
-class object {
-var myContainer : Container? = Container()
-}
-}
-open class Test() {
-var b : Byte = One.myContainer?.myInt!!.toByte()
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-820-string.jav b/tests/testData/ast/issues/file/kt-820-string.jav
deleted file mode 100644
index 9bc81004c38..00000000000
--- a/tests/testData/ast/issues/file/kt-820-string.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-class Test {
-    public static String toFileSystemSafeName(String name) {
-        int size = name.length();
-        return name;
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-820-string.kt b/tests/testData/ast/issues/file/kt-820-string.kt
deleted file mode 100644
index 762e1aa8f90..00000000000
--- a/tests/testData/ast/issues/file/kt-820-string.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-open class Test() {
-class object {
-public open fun toFileSystemSafeName(name : String?) : String? {
-var size : Int = name?.length()!!
-return name
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-820.jav b/tests/testData/ast/issues/file/kt-820.jav
deleted file mode 100644
index 20ac0acdb97..00000000000
--- a/tests/testData/ast/issues/file/kt-820.jav
+++ /dev/null
@@ -1,15 +0,0 @@
-package demo;
-
-class Container {
-  int myInt = 1;
-}
-
-class One {
-  static Container myContainer = new Container();
-}
-
-class Test {
-  void test() {
-    byte b = One.myContainer.myInt;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-820.kt b/tests/testData/ast/issues/file/kt-820.kt
deleted file mode 100644
index 77fbee788f3..00000000000
--- a/tests/testData/ast/issues/file/kt-820.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package demo
-open class Container() {
-var myInt : Int = 1
-}
-open class One() {
-class object {
-var myContainer : Container? = Container()
-}
-}
-open class Test() {
-open fun test() : Unit {
-var b : Byte = One.myContainer?.myInt!!.toByte()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-824-isDir.jav b/tests/testData/ast/issues/file/kt-824-isDir.jav
deleted file mode 100644
index 3429c9be45f..00000000000
--- a/tests/testData/ast/issues/file/kt-824-isDir.jav
+++ /dev/null
@@ -1,18 +0,0 @@
-package test;
-import java.io.File;
-
-/**
- * User: ignatov
- */
-public class Test {
-    public static boolean isDir(File parent) {
-        if (parent == null || !parent.exists()) {
-            return false;
-        }
-        boolean result = true;
-        if (parent.isDirectory()) {
-            return true;
-        } else
-            return false;
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-824-isDir.kt b/tests/testData/ast/issues/file/kt-824-isDir.kt
deleted file mode 100644
index 715092216b6..00000000000
--- a/tests/testData/ast/issues/file/kt-824-isDir.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package test
-import java.io.File
-/**
-* User: ignatov
-*/
-public open class Test() {
-class object {
-public open fun isDir(parent : File?) : Boolean {
-if (parent == null || !parent?.exists()!!)
-{
-return false
-}
-var result : Boolean = true
-if (parent?.isDirectory()!!)
-{
-return true
-}
-else
-return false
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-824.jav b/tests/testData/ast/issues/file/kt-824.jav
deleted file mode 100644
index 4e0a95754fd..00000000000
--- a/tests/testData/ast/issues/file/kt-824.jav
+++ /dev/null
@@ -1,25 +0,0 @@
-package demo;
-
-class Container {
-  boolean myBoolean = true;
-}
-
-class One {
-  static Container myContainer = new Container();
-}
-
-class Test {
-  void test() {
-    if (One.myContainer.myBoolean)
-      System.out.println("Ok");
-
-    String s = One.myContainer.myBoolean ? "YES" : "NO";
-
-    while (One.myContainer.myBoolean)
-      System.out.println("Ok");
-
-    do {
-      System.out.println("Ok");
-    } while (One.myContainer.myBoolean)
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-824.kt b/tests/testData/ast/issues/file/kt-824.kt
deleted file mode 100644
index 065f372cb69..00000000000
--- a/tests/testData/ast/issues/file/kt-824.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package demo
-open class Container() {
-var myBoolean : Boolean = true
-}
-open class One() {
-class object {
-var myContainer : Container? = Container()
-}
-}
-open class Test() {
-open fun test() : Unit {
-if (One.myContainer?.myBoolean!!)
-System.out?.println("Ok")
-var s : String? = (if (One.myContainer?.myBoolean!!)
-"YES"
-else
-"NO")
-while (One.myContainer?.myBoolean!!)
-System.out?.println("Ok")
-do
-{
-System.out?.println("Ok")
-}
-while (One.myContainer?.myBoolean!!)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-828.jav b/tests/testData/ast/issues/file/kt-828.jav
deleted file mode 100644
index 682975f22e0..00000000000
--- a/tests/testData/ast/issues/file/kt-828.jav
+++ /dev/null
@@ -1,15 +0,0 @@
-class Test {
-  void test() {
-    boolean res = true;
-    res &= false;
-    res |= false;
-    res ^= false;
-    System.out.println(true & false);
-    System.out.println(true | false);
-    System.out.println(true ^ false);
-    System.out.println(!true);
-
-    System.out.println(true && false);
-    System.out.println(true || false);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-828.kt b/tests/testData/ast/issues/file/kt-828.kt
deleted file mode 100644
index 3ed25233de4..00000000000
--- a/tests/testData/ast/issues/file/kt-828.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-open class Test() {
-open fun test() : Unit {
-var res : Boolean = true
-res = res and false
-res = res or false
-res = res xor false
-System.out?.println(true and false)
-System.out?.println(true or false)
-System.out?.println(true xor false)
-System.out?.println(!true)
-System.out?.println(true && false)
-System.out?.println(true || false)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-836.jav b/tests/testData/ast/issues/file/kt-836.jav
deleted file mode 100644
index 99d0b460e3a..00000000000
--- a/tests/testData/ast/issues/file/kt-836.jav
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.voltvoodoo.saplo4j.model;
-
-import java.io.Serializable;
-
-public class Language implements Serializable {
-        protected String code;
-
-        public Language(String code) {
-                this.code = code;
-        }
-
-        public String toString() {
-                return this.code;
-        }
-}
-
-
-class Base {
-  void test() {}
-  String toString() {
-    return "BASE";
-  }
-}
-
-class Child extends Base {
-  void test() {}
-  String toString() {
-      return "Child";
-  }
-}
diff --git a/tests/testData/ast/issues/file/kt-836.kt b/tests/testData/ast/issues/file/kt-836.kt
deleted file mode 100644
index 938269632b7..00000000000
--- a/tests/testData/ast/issues/file/kt-836.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.voltvoodoo.saplo4j.model
-import java.io.Serializable
-public open class Language(code : String?) : Serializable {
-protected var code : String? = null
-public override fun toString() : String? {
-return this.code
-}
-{
-this.code = code
-}
-}
-open class Base() {
-open fun test() : Unit {
-}
-open fun toString() : String? {
-return "BASE"
-}
-}
-open class Child() : Base() {
-override fun test() : Unit {
-}
-override fun toString() : String? {
-return "Child"
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-837.jav b/tests/testData/ast/issues/file/kt-837.jav
deleted file mode 100644
index c1f41afeccf..00000000000
--- a/tests/testData/ast/issues/file/kt-837.jav
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.voltvoodoo.saplo4j.model;
-
-import java.io.Serializable;
-
-public class Language implements Serializable {
-        public static Language ENGLISH = new Language("en");
-        public static Language SWEDISH = new Language("sv");
-
-        protected String code;
-        private static final long serialVersionUID = -2442762969929206780L;
-
-        public Language(String code) {
-                this.code = code;
-        }
-
-        public boolean equals(Language other) {
-                return other.toString().equals(this.toString());
-        }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-837.kt b/tests/testData/ast/issues/file/kt-837.kt
deleted file mode 100644
index a04124924ea..00000000000
--- a/tests/testData/ast/issues/file/kt-837.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.voltvoodoo.saplo4j.model
-import java.io.Serializable
-public open class Language(code : String?) : Serializable {
-protected var code : String? = null
-public open fun equals(other : Language?) : Boolean {
-return other?.toString()?.equals(this.toString())!!
-}
-{
-this.code = code
-}
-class object {
-public var ENGLISH : Language? = Language("en")
-public var SWEDISH : Language? = Language("sv")
-private val serialVersionUID : Long = -2442762969929206780
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-852.jav b/tests/testData/ast/issues/file/kt-852.jav
deleted file mode 100644
index b9abf40fe36..00000000000
--- a/tests/testData/ast/issues/file/kt-852.jav
+++ /dev/null
@@ -1,16 +0,0 @@
-package demo;
-
-class Test {
-  String test() {
-    String s1 = "";
-    String s2 = "";
-    String s3 = "";
-    if (s1.isEmpty() && s2.isEmpty())
-      return "OK";
-
-    if (s1.isEmpty() && s2.isEmpty() && s3.isEmpty())
-      return "OOOK";
-
-    return "";
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-852.kt b/tests/testData/ast/issues/file/kt-852.kt
deleted file mode 100644
index 1dc37fb5e16..00000000000
--- a/tests/testData/ast/issues/file/kt-852.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package demo
-open class Test() {
-open fun test() : String? {
-var s1 : String? = ""
-var s2 : String? = ""
-var s3 : String? = ""
-if (s1?.isEmpty()!! && s2?.isEmpty()!!)
-return "OK"
-if (s1?.isEmpty()!! && s2?.isEmpty()!! && s3?.isEmpty()!!)
-return "OOOK"
-return ""
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-871.jav b/tests/testData/ast/issues/file/kt-871.jav
deleted file mode 100644
index b49b8041fc5..00000000000
--- a/tests/testData/ast/issues/file/kt-871.jav
+++ /dev/null
@@ -1,7 +0,0 @@
-package demo;
-
-class Program {
-  public static void main(String[] args) {
-    System.out.println("Halo!");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-871.kt b/tests/testData/ast/issues/file/kt-871.kt
deleted file mode 100644
index 6f613625456..00000000000
--- a/tests/testData/ast/issues/file/kt-871.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo
-open class Program() {
-class object {
-public open fun main(args : Array<String?>?) : Unit {
-System.out?.println("Halo!")
-}
-}
-}
-fun main(args : Array<String>) = Program.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-879.jav b/tests/testData/ast/issues/file/kt-879.jav
deleted file mode 100644
index bd55559a3d8..00000000000
--- a/tests/testData/ast/issues/file/kt-879.jav
+++ /dev/null
@@ -1,16 +0,0 @@
-class Test {
-    public static int getInt(int i) {
-        switch (i) {
-            case 0:
-                return 0;
-            case 1:
-                return 1;
-            case 2:
-                return 2;
-            case 3:
-                return 3;
-            default:
-                return -1;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-879.kt b/tests/testData/ast/issues/file/kt-879.kt
deleted file mode 100644
index b52d1403a85..00000000000
--- a/tests/testData/ast/issues/file/kt-879.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-open class Test() {
-class object {
-public open fun getInt(i : Int) : Int {
-when (i) {
-0 -> {
-return 0
-}
-1 -> {
-return 1
-}
-2 -> {
-return 2
-}
-3 -> {
-return 3
-}
-else -> {
-return -1
-}
-}
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-893.jav b/tests/testData/ast/issues/file/kt-893.jav
deleted file mode 100644
index 8637f952b7e..00000000000
--- a/tests/testData/ast/issues/file/kt-893.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo;
-
-class Test {
-  void test() {
-    for(int i = 0; i < 10; ++i) {
-      System.out.println(i)
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-893.kt b/tests/testData/ast/issues/file/kt-893.kt
deleted file mode 100644
index 7e5d3bb6509..00000000000
--- a/tests/testData/ast/issues/file/kt-893.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package demo
-open class Test() {
-open fun test() : Unit {
-for (i in 0..10 - 1) {
-System.out?.println(i)
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-963.jav b/tests/testData/ast/issues/file/kt-963.jav
deleted file mode 100644
index 9e2cbb3e114..00000000000
--- a/tests/testData/ast/issues/file/kt-963.jav
+++ /dev/null
@@ -1,8 +0,0 @@
-package demo;
-
-class C {
-  public C(int a) {
-    abc = a * 2;
-  }
-  int abc = 0;
-}
\ No newline at end of file
diff --git a/tests/testData/ast/issues/file/kt-963.kt b/tests/testData/ast/issues/file/kt-963.kt
deleted file mode 100644
index 2e024295a77..00000000000
--- a/tests/testData/ast/issues/file/kt-963.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package demo
-open class C(a : Int) {
-var abc : Int = 0
-{
-abc = a * 2
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/kotlinExclusion/file/kt-656.jav b/tests/testData/ast/kotlinExclusion/file/kt-656.jav
deleted file mode 100644
index 1c05dc9b7be..00000000000
--- a/tests/testData/ast/kotlinExclusion/file/kt-656.jav
+++ /dev/null
@@ -1,27 +0,0 @@
-package demo;
-
-import java.util.Iterator;
-
-class Test implements Iterable<String> {
-  @Override
-  public Iterator<String> iterator() {
-    return null;
-  }
-
-  public Iterator<String> push(Iterator<String> i) {
-    Iterator<String> j = i;
-    return j;
-  }
-}
-
-class FullTest implements java.lang.Iterable<String> {
-  @Override
-  public java.util.Iterator<String> iterator() {
-    return null;
-  }
-
-  public java.util.Iterator<String> push(java.util.Iterator<String> i) {
-    java.util.Iterator<String> j = i;
-    return j;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/kotlinExclusion/file/kt-656.kt b/tests/testData/ast/kotlinExclusion/file/kt-656.kt
deleted file mode 100644
index d42a74320de..00000000000
--- a/tests/testData/ast/kotlinExclusion/file/kt-656.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package demo
-open class Test() : java.lang.Iterable<String?> {
-public override fun iterator() : java.util.Iterator<String?>? {
-return null
-}
-public open fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
-var j : java.util.Iterator<String?>? = i
-return j
-}
-}
-open class FullTest() : java.lang.Iterable<String?> {
-public override fun iterator() : java.util.Iterator<String?>? {
-return null
-}
-public open fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
-var j : java.util.Iterator<String?>? = i
-return j
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav b/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav
deleted file mode 100644
index 5c8ac99dd07..00000000000
--- a/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav
+++ /dev/null
@@ -1 +0,0 @@
-    test:        for (int i = 0; i <= max; i++) {            int n = substring.length();            int j = i;            int k = 0;            while (n-- != 0) {                if (searchMe.charAt(j++) != substring.charAt(k++)) {                    continue test;                }            }                foundIt = true;            break test;        }        System.out.println(foundIt ? "Found it" : "Didn't find it");    }}
\ No newline at end of file
diff --git a/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt b/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt
deleted file mode 100644
index bb5b07c2f36..00000000000
--- a/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-@test for (i in 0..max) {
-var n : Int = substring.length()
-var j : Int = i
-var k : Int = 0
-while (n-- != 0)
-{
-if (searchMe.charAt(j++) != substring.charAt(k++))
-{
-continue@test
-}
-}
-foundIt = true
-break@test
-}
-System.out?.println((if (foundIt)
-"Found it"
-else
-"Didn't find it"))
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/char.jav b/tests/testData/ast/literalExpression/file/char.jav
deleted file mode 100644
index 653706393b2..00000000000
--- a/tests/testData/ast/literalExpression/file/char.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-class Test {
-  void test() {
-    char c1 = 'c';
-    Character c2 = 'C';
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/char.kt b/tests/testData/ast/literalExpression/file/char.kt
deleted file mode 100644
index d8749cea99d..00000000000
--- a/tests/testData/ast/literalExpression/file/char.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-open class Test() {
-open fun test() : Unit {
-var c1 : Char = 'c'
-var c2 : Char? = 'C'
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/dollarInsideString.jav b/tests/testData/ast/literalExpression/file/dollarInsideString.jav
deleted file mode 100644
index 51039d40d25..00000000000
--- a/tests/testData/ast/literalExpression/file/dollarInsideString.jav
+++ /dev/null
@@ -1,14 +0,0 @@
-package demo;
-
-class Test {
-  void test() {
-    String name = "$$$$";
-    name = name.replaceAll("\\$[0-9]+", "\\$")
-
-    char c = '$';
-    System.out.println(c);
-
-    Character C = '$';
-    System.out.println(C);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/dollarInsideString.kt b/tests/testData/ast/literalExpression/file/dollarInsideString.kt
deleted file mode 100644
index 6a42dcad2c9..00000000000
--- a/tests/testData/ast/literalExpression/file/dollarInsideString.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo
-open class Test() {
-open fun test() : Unit {
-var name : String? = "$$$$"
-name = name?.replaceAll("\\$[0-9]+", "\\$")
-var c : Char = '$'
-System.out?.println(c)
-var C : Char? = '$'
-System.out?.println(C)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/endsWithDFL.jav b/tests/testData/ast/literalExpression/file/endsWithDFL.jav
deleted file mode 100644
index 4b4450d3303..00000000000
--- a/tests/testData/ast/literalExpression/file/endsWithDFL.jav
+++ /dev/null
@@ -1,21 +0,0 @@
-class Test {
-  void test() {
-    long l1 = 10L;
-    double d1 = 10.0D;
-    float f1 = 10.0F;
-
-    long l2 = 10l;
-    double d2 = 10.0d;
-    float f2 = 10.0f;
-  }
-
-  void testBoxed() {
-      Long l1 = 10L;
-      Double d1 = 10.0D;
-      Float f1 = 10.0F;
-
-      Long l2 = 10l;
-      Double d2 = 10.0d;
-      Float f2 = 10.0f;
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/endsWithDFL.kt b/tests/testData/ast/literalExpression/file/endsWithDFL.kt
deleted file mode 100644
index 00e8dd282f5..00000000000
--- a/tests/testData/ast/literalExpression/file/endsWithDFL.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-open class Test() {
-open fun test() : Unit {
-var l1 : Long = 10
-var d1 : Double = 10.0
-var f1 : Float = 10.0.toFloat()
-var l2 : Long = 10
-var d2 : Double = 10.0
-var f2 : Float = 10.0.toFloat()
-}
-open fun testBoxed() : Unit {
-var l1 : Long? = 10
-var d1 : Double? = 10.0
-var f1 : Float? = 10.0.toFloat()
-var l2 : Long? = 10
-var d2 : Double? = 10.0
-var f2 : Float? = 10.0.toFloat()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/hex.jav b/tests/testData/ast/literalExpression/file/hex.jav
deleted file mode 100644
index 285af379ea2..00000000000
--- a/tests/testData/ast/literalExpression/file/hex.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-class Test {
-  void test() {
-    int i1 = 0x21;
-    Int i2 = 0x33;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/hex.kt b/tests/testData/ast/literalExpression/file/hex.kt
deleted file mode 100644
index 0bd6b37ae40..00000000000
--- a/tests/testData/ast/literalExpression/file/hex.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-open class Test() {
-open fun test() : Unit {
-var i1 : Int = 33
-var i2 : Int? = 51
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/octal.jav b/tests/testData/ast/literalExpression/file/octal.jav
deleted file mode 100644
index 900549670fb..00000000000
--- a/tests/testData/ast/literalExpression/file/octal.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-class Test {
-  void test() {
-    int i1 = 045;
-    Int i2 = 032;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/octal.kt b/tests/testData/ast/literalExpression/file/octal.kt
deleted file mode 100644
index 83165bcc6fc..00000000000
--- a/tests/testData/ast/literalExpression/file/octal.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-open class Test() {
-open fun test() : Unit {
-var i1 : Int = 37
-var i2 : Int? = 26
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/trueOrFalse.jav b/tests/testData/ast/literalExpression/file/trueOrFalse.jav
deleted file mode 100644
index 2b6495e3427..00000000000
--- a/tests/testData/ast/literalExpression/file/trueOrFalse.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-class Test {
-  void test() {
-    boolean t1 = true;
-    Boolean t2 = true;
-
-    boolean f1 = false;
-    Boolean f2 = false;
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/literalExpression/file/trueOrFalse.kt b/tests/testData/ast/literalExpression/file/trueOrFalse.kt
deleted file mode 100644
index ad61883202e..00000000000
--- a/tests/testData/ast/literalExpression/file/trueOrFalse.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-open class Test() {
-open fun test() : Unit {
-var t1 : Boolean = true
-var t2 : Boolean? = true
-var f1 : Boolean = false
-var f2 : Boolean? = false
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/localVariable/statement/object.jav b/tests/testData/ast/localVariable/statement/object.jav
deleted file mode 100644
index c9cd10a31fd..00000000000
--- a/tests/testData/ast/localVariable/statement/object.jav
+++ /dev/null
@@ -1 +0,0 @@
-int i;
\ No newline at end of file
diff --git a/tests/testData/ast/localVariable/statement/object.kt b/tests/testData/ast/localVariable/statement/object.kt
deleted file mode 100644
index 03ab5111a88..00000000000
--- a/tests/testData/ast/localVariable/statement/object.kt
+++ /dev/null
@@ -1 +0,0 @@
-var i : Int
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/file/genericMethod.jav b/tests/testData/ast/methodCallExpression/file/genericMethod.jav
deleted file mode 100644
index 952645f5f09..00000000000
--- a/tests/testData/ast/methodCallExpression/file/genericMethod.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-package demo;
-
-class Map {
-  <K, V> void put(K k, V v) {}
-}
-
-class U {
-  void test() {
-    Map m = new Map();
-    m.<String, int>put("10", 10);
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/file/genericMethod.kt b/tests/testData/ast/methodCallExpression/file/genericMethod.kt
deleted file mode 100644
index b130cbc9376..00000000000
--- a/tests/testData/ast/methodCallExpression/file/genericMethod.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo
-open class Map() {
-open fun put<K, V>(k : K?, v : V?) : Unit {
-}
-}
-open class U() {
-open fun test() : Unit {
-var m : Map? = Map()
-m?.put<String?, Int>("10", 10)
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav b/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav
deleted file mode 100644
index db350dda8fc..00000000000
--- a/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav
+++ /dev/null
@@ -1 +0,0 @@
-when(open, trait);
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/statement/callWithKeywords.kt b/tests/testData/ast/methodCallExpression/statement/callWithKeywords.kt
deleted file mode 100644
index 489e2d97b10..00000000000
--- a/tests/testData/ast/methodCallExpression/statement/callWithKeywords.kt
+++ /dev/null
@@ -1 +0,0 @@
-`when`(open, `trait`)
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/statement/emptyCall.jav b/tests/testData/ast/methodCallExpression/statement/emptyCall.jav
deleted file mode 100644
index 9c6af147cda..00000000000
--- a/tests/testData/ast/methodCallExpression/statement/emptyCall.jav
+++ /dev/null
@@ -1 +0,0 @@
-methodCall();
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/statement/emptyCall.kt b/tests/testData/ast/methodCallExpression/statement/emptyCall.kt
deleted file mode 100644
index 60d495be000..00000000000
--- a/tests/testData/ast/methodCallExpression/statement/emptyCall.kt
+++ /dev/null
@@ -1 +0,0 @@
-methodCall()
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/statement/simpleCall.jav b/tests/testData/ast/methodCallExpression/statement/simpleCall.jav
deleted file mode 100644
index 0e52b457e69..00000000000
--- a/tests/testData/ast/methodCallExpression/statement/simpleCall.jav
+++ /dev/null
@@ -1 +0,0 @@
-method(param1, param2);
\ No newline at end of file
diff --git a/tests/testData/ast/methodCallExpression/statement/simpleCall.kt b/tests/testData/ast/methodCallExpression/statement/simpleCall.kt
deleted file mode 100644
index 43ea8339772..00000000000
--- a/tests/testData/ast/methodCallExpression/statement/simpleCall.kt
+++ /dev/null
@@ -1 +0,0 @@
-method(param1, param2)
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/classWithParam.jav b/tests/testData/ast/newClassExpression/expression/classWithParam.jav
deleted file mode 100644
index 44849d3495c..00000000000
--- a/tests/testData/ast/newClassExpression/expression/classWithParam.jav
+++ /dev/null
@@ -1 +0,0 @@
-new Foo(param);
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/classWithParam.kt b/tests/testData/ast/newClassExpression/expression/classWithParam.kt
deleted file mode 100644
index 9d29e159e31..00000000000
--- a/tests/testData/ast/newClassExpression/expression/classWithParam.kt
+++ /dev/null
@@ -1 +0,0 @@
-Foo(param)
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/classWithParams.jav b/tests/testData/ast/newClassExpression/expression/classWithParams.jav
deleted file mode 100644
index 2461539a170..00000000000
--- a/tests/testData/ast/newClassExpression/expression/classWithParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-new Foo(param1, param2);
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/classWithParams.kt b/tests/testData/ast/newClassExpression/expression/classWithParams.kt
deleted file mode 100644
index e10fb436db2..00000000000
--- a/tests/testData/ast/newClassExpression/expression/classWithParams.kt
+++ /dev/null
@@ -1 +0,0 @@
-Foo(param1, param2)
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav b/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav
deleted file mode 100644
index acad3c2ee3f..00000000000
--- a/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav
+++ /dev/null
@@ -1 +0,0 @@
-new Foo();
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/classWithoutBody.kt b/tests/testData/ast/newClassExpression/expression/classWithoutBody.kt
deleted file mode 100644
index 17f280dc444..00000000000
--- a/tests/testData/ast/newClassExpression/expression/classWithoutBody.kt
+++ /dev/null
@@ -1 +0,0 @@
-Foo()
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav b/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav
deleted file mode 100644
index fd947e43a0c..00000000000
--- a/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-new Runnable() {
-  @Override
-  public void run() {
-    System.out.println("Run");
-  }
-};
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt b/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt
deleted file mode 100644
index 29038a298dc..00000000000
--- a/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-object : Runnable() {
-public override fun run() : Unit {
-System.out?.println("Run")
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav b/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav
deleted file mode 100644
index de1ff2bd28c..00000000000
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav
+++ /dev/null
@@ -1,9 +0,0 @@
-package test;
-
-import java.util.List;
-
-class User {
-  void main() {
-    List list = new java.util.LinkedList();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt b/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
deleted file mode 100644
index 808085fdf6f..00000000000
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-open class User() {
-open fun main() : Unit {
-var list : MutableList<*>? = java.util.LinkedList()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav b/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav
deleted file mode 100644
index e8ef97b8b9e..00000000000
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav
+++ /dev/null
@@ -1,7 +0,0 @@
-package test;
-
-class User {
-  void main() {
-    java.util.List list = new java.util.LinkedList();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
deleted file mode 100644
index 808085fdf6f..00000000000
--- a/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-open class User() {
-open fun main() : Unit {
-var list : MutableList<*>? = java.util.LinkedList()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav b/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav
deleted file mode 100644
index a74e92a8bc5..00000000000
--- a/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav
+++ /dev/null
@@ -1,8 +0,0 @@
-import java.util.List;
-import java.util.LinkedList;
-
-class User {
-  void main() {
-    List<String> list = new LinkedList<String>();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt b/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
deleted file mode 100644
index d110bb30c16..00000000000
--- a/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-import java.util.LinkedList
-open class User() {
-open fun main() : Unit {
-var list : MutableList<String?>? = LinkedList<String?>()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newClassByFullName.jav b/tests/testData/ast/newClassExpression/file/newClassByFullName.jav
deleted file mode 100644
index 486db1bec93..00000000000
--- a/tests/testData/ast/newClassExpression/file/newClassByFullName.jav
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.test
-
-class Library {}
-}
-
-class User {
-  void main() {
-    Library lib = new Library();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newClassByFullName.kt b/tests/testData/ast/newClassExpression/file/newClassByFullName.kt
deleted file mode 100644
index adb7fce935a..00000000000
--- a/tests/testData/ast/newClassExpression/file/newClassByFullName.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.test
-open class Library() {
-}
-open class User() {
-open fun main() : Unit {
-var lib : Library? = Library()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newInnerClass.jav b/tests/testData/ast/newClassExpression/file/newInnerClass.jav
deleted file mode 100644
index 1f4cdf9f589..00000000000
--- a/tests/testData/ast/newClassExpression/file/newInnerClass.jav
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.test;
-
-class OuterClass {
-  class InnerClass {
-  }
-}
-
-class User {
-  void main() {
-    OuterClass outerObject = new OuterClass();
-    OuterClass.InnerClass innerObject = outerObject.new InnerClass();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newInnerClass.kt b/tests/testData/ast/newClassExpression/file/newInnerClass.kt
deleted file mode 100644
index 93c7fec3411..00000000000
--- a/tests/testData/ast/newClassExpression/file/newInnerClass.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.test
-open class OuterClass() {
-open class InnerClass() {
-}
-}
-open class User() {
-open fun main() : Unit {
-var outerObject : OuterClass? = OuterClass()
-var innerObject : OuterClass.InnerClass? = outerObject?.InnerClass()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav b/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav
deleted file mode 100644
index 8ed2bad7297..00000000000
--- a/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.test;
-
-import java.util.List;
-import java.util.LinkedList;
-
-class Member {}
-
-class User {
-  void main() {
-    List<Member> members = new LinkedList<Member>();
-    members.add(new Member());
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt b/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
deleted file mode 100644
index 1f5699c575d..00000000000
--- a/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.test
-import java.util.LinkedList
-open class Member() {
-}
-open class User() {
-open fun main() : Unit {
-var members : MutableList<Member?>? = LinkedList<Member?>()
-members?.add(Member())
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav b/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav
deleted file mode 100644
index 0465c7498aa..00000000000
--- a/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo;
-
-class Foo {
-  static class Bar {}
-}
-
-class User {
-  void main() {
-    Foo.Bar boo = new Foo.Bar();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/newClassExpression/file/newStaticInnerClass.kt b/tests/testData/ast/newClassExpression/file/newStaticInnerClass.kt
deleted file mode 100644
index 3a6a440f397..00000000000
--- a/tests/testData/ast/newClassExpression/file/newStaticInnerClass.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package demo
-open class Foo() {
-class object {
-open class Bar() {
-}
-}
-}
-open class User() {
-open fun main() : Unit {
-var boo : Foo.Bar? = Foo.Bar()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/objectLiteral/file/MyFrame.jav b/tests/testData/ast/objectLiteral/file/MyFrame.jav
deleted file mode 100644
index 28e0dbef4de..00000000000
--- a/tests/testData/ast/objectLiteral/file/MyFrame.jav
+++ /dev/null
@@ -1,24 +0,0 @@
-package demo;
-
-class WindowAdapter {
-  public void windowClosing () {
-  }
-}
-
-public final class Client extends Frame {
-  Client() {
-    WindowAdapter a = new WindowAdapter() {
-      @Override
-      public void windowClosing () {
-      }
-    }
-
-    addWindowListener(a);
-
-    addWindowListener(new WindowAdapter() {
-      @Override
-      public void windowClosing () {
-      }
-    });
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/objectLiteral/file/MyFrame.kt b/tests/testData/ast/objectLiteral/file/MyFrame.kt
deleted file mode 100644
index 270a5e9625f..00000000000
--- a/tests/testData/ast/objectLiteral/file/MyFrame.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package demo
-open class WindowAdapter() {
-public open fun windowClosing() : Unit {
-}
-}
-public class Client() : Frame() {
-{
-var a : WindowAdapter? = object : WindowAdapter() {
-public override fun windowClosing() : Unit {
-}
-}
-addWindowListener(a)
-addWindowListener(object : WindowAdapter() {
-public override fun windowClosing() : Unit {
-}
-})
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/outProjectionType/method/methodParams.jav b/tests/testData/ast/outProjectionType/method/methodParams.jav
deleted file mode 100644
index ac87941ea87..00000000000
--- a/tests/testData/ast/outProjectionType/method/methodParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-void pushAll(Collection<? extends E> src) {}
\ No newline at end of file
diff --git a/tests/testData/ast/outProjectionType/method/methodParams.kt b/tests/testData/ast/outProjectionType/method/methodParams.kt
deleted file mode 100644
index 373c01e629f..00000000000
--- a/tests/testData/ast/outProjectionType/method/methodParams.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun pushAll(src : Collection<out E?>?) : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav b/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav
deleted file mode 100644
index 7b8f669aba1..00000000000
--- a/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.jetbrains.jet.j2k.in;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class Converter {}
\ No newline at end of file
diff --git a/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt b/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
deleted file mode 100644
index a673d540277..00000000000
--- a/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.jetbrains.jet.j2k.`in`
-import org.jetbrains.annotations.Nullable
-public open class Converter() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/parenthesizedExpression/expression/parenthesized.jav b/tests/testData/ast/parenthesizedExpression/expression/parenthesized.jav
deleted file mode 100644
index 0a911375668..00000000000
--- a/tests/testData/ast/parenthesizedExpression/expression/parenthesized.jav
+++ /dev/null
@@ -1 +0,0 @@
-(1 + 2)
\ No newline at end of file
diff --git a/tests/testData/ast/parenthesizedExpression/expression/parenthesized.kt b/tests/testData/ast/parenthesizedExpression/expression/parenthesized.kt
deleted file mode 100644
index 0a911375668..00000000000
--- a/tests/testData/ast/parenthesizedExpression/expression/parenthesized.kt
+++ /dev/null
@@ -1 +0,0 @@
-(1 + 2)
\ No newline at end of file
diff --git a/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.jav b/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.jav
deleted file mode 100644
index 01d3d19b7d8..00000000000
--- a/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.jav
+++ /dev/null
@@ -1 +0,0 @@
-(str.toString() + "abc")
\ No newline at end of file
diff --git a/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.kt b/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.kt
deleted file mode 100644
index 01d3d19b7d8..00000000000
--- a/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.kt
+++ /dev/null
@@ -1 +0,0 @@
-(str.toString() + "abc")
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/divide.jav b/tests/testData/ast/polyadicExpression/expression/divide.jav
deleted file mode 100644
index 6005ff02b5d..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/divide.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 / 2 / 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/divide.kt b/tests/testData/ast/polyadicExpression/expression/divide.kt
deleted file mode 100644
index 6005ff02b5d..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/divide.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 / 2 / 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/minus.jav b/tests/testData/ast/polyadicExpression/expression/minus.jav
deleted file mode 100644
index 35002f64d1e..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/minus.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 - 2 - 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/minus.kt b/tests/testData/ast/polyadicExpression/expression/minus.kt
deleted file mode 100644
index 35002f64d1e..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/minus.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 - 2 - 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/multiply.jav b/tests/testData/ast/polyadicExpression/expression/multiply.jav
deleted file mode 100644
index 89ddea79483..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/multiply.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 * 2 * 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/multiply.kt b/tests/testData/ast/polyadicExpression/expression/multiply.kt
deleted file mode 100644
index 89ddea79483..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/multiply.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 * 2 * 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/plus.jav b/tests/testData/ast/polyadicExpression/expression/plus.jav
deleted file mode 100644
index 8a2a3c5ef6f..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/plus.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 + 2 + 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/plus.kt b/tests/testData/ast/polyadicExpression/expression/plus.kt
deleted file mode 100644
index 8a2a3c5ef6f..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/plus.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 + 2 + 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/remainder.jav b/tests/testData/ast/polyadicExpression/expression/remainder.jav
deleted file mode 100644
index 2e120c0cd68..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/remainder.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 % 2 % 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/remainder.kt b/tests/testData/ast/polyadicExpression/expression/remainder.kt
deleted file mode 100644
index 2e120c0cd68..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/remainder.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 % 2 % 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav b/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav
deleted file mode 100644
index c9745ec8062..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav
+++ /dev/null
@@ -1 +0,0 @@
-1 >>> 2 >>> 3
\ No newline at end of file
diff --git a/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt b/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt
deleted file mode 100644
index 83d192a6a77..00000000000
--- a/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt
+++ /dev/null
@@ -1 +0,0 @@
-1 ushr 2 ushr 3
\ No newline at end of file
diff --git a/tests/testData/ast/postfixOperator/statement/decrement.jav b/tests/testData/ast/postfixOperator/statement/decrement.jav
deleted file mode 100644
index 47b6f21c63d..00000000000
--- a/tests/testData/ast/postfixOperator/statement/decrement.jav
+++ /dev/null
@@ -1 +0,0 @@
-i--;
\ No newline at end of file
diff --git a/tests/testData/ast/postfixOperator/statement/decrement.kt b/tests/testData/ast/postfixOperator/statement/decrement.kt
deleted file mode 100644
index b45bc7f1686..00000000000
--- a/tests/testData/ast/postfixOperator/statement/decrement.kt
+++ /dev/null
@@ -1 +0,0 @@
-i--
\ No newline at end of file
diff --git a/tests/testData/ast/postfixOperator/statement/increment.jav b/tests/testData/ast/postfixOperator/statement/increment.jav
deleted file mode 100644
index 689efdaa358..00000000000
--- a/tests/testData/ast/postfixOperator/statement/increment.jav
+++ /dev/null
@@ -1 +0,0 @@
-i++;
\ No newline at end of file
diff --git a/tests/testData/ast/postfixOperator/statement/increment.kt b/tests/testData/ast/postfixOperator/statement/increment.kt
deleted file mode 100644
index f47eebed94d..00000000000
--- a/tests/testData/ast/postfixOperator/statement/increment.kt
+++ /dev/null
@@ -1 +0,0 @@
-i++
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/decrement.jav b/tests/testData/ast/prefixOperator/statement/decrement.jav
deleted file mode 100644
index 10724ba55da..00000000000
--- a/tests/testData/ast/prefixOperator/statement/decrement.jav
+++ /dev/null
@@ -1 +0,0 @@
---i;
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/decrement.kt b/tests/testData/ast/prefixOperator/statement/decrement.kt
deleted file mode 100644
index 33b7049c8ba..00000000000
--- a/tests/testData/ast/prefixOperator/statement/decrement.kt
+++ /dev/null
@@ -1 +0,0 @@
---i
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/excl.jav b/tests/testData/ast/prefixOperator/statement/excl.jav
deleted file mode 100644
index 93e541d4332..00000000000
--- a/tests/testData/ast/prefixOperator/statement/excl.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-boolean i = true;
-boolean j = !i;
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/excl.kt b/tests/testData/ast/prefixOperator/statement/excl.kt
deleted file mode 100644
index 54a88090fcb..00000000000
--- a/tests/testData/ast/prefixOperator/statement/excl.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-var i : Boolean = true
-var j : Boolean = !i
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/increment.jav b/tests/testData/ast/prefixOperator/statement/increment.jav
deleted file mode 100644
index 97ad097f1e2..00000000000
--- a/tests/testData/ast/prefixOperator/statement/increment.jav
+++ /dev/null
@@ -1 +0,0 @@
-++i;
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/increment.kt b/tests/testData/ast/prefixOperator/statement/increment.kt
deleted file mode 100644
index de36816d982..00000000000
--- a/tests/testData/ast/prefixOperator/statement/increment.kt
+++ /dev/null
@@ -1 +0,0 @@
-++i
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/kt-667.jav b/tests/testData/ast/prefixOperator/statement/kt-667.jav
deleted file mode 100644
index eb1dc5658a7..00000000000
--- a/tests/testData/ast/prefixOperator/statement/kt-667.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-int i = ~10;
-int j = ~(i * 100);
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/kt-667.kt b/tests/testData/ast/prefixOperator/statement/kt-667.kt
deleted file mode 100644
index 529e9a8b422..00000000000
--- a/tests/testData/ast/prefixOperator/statement/kt-667.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-var i : Int = (10).inv()
-var j : Int = ((i * 100)).inv()
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/tilde.jav b/tests/testData/ast/prefixOperator/statement/tilde.jav
deleted file mode 100644
index 354a6ddb01b..00000000000
--- a/tests/testData/ast/prefixOperator/statement/tilde.jav
+++ /dev/null
@@ -1,2 +0,0 @@
-int i = 10;
-int j = ~10;
\ No newline at end of file
diff --git a/tests/testData/ast/prefixOperator/statement/tilde.kt b/tests/testData/ast/prefixOperator/statement/tilde.kt
deleted file mode 100644
index 96d67f4d028..00000000000
--- a/tests/testData/ast/prefixOperator/statement/tilde.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-var i : Int = 10
-var j : Int = (10).inv()
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540-map.jav b/tests/testData/ast/rawGenerics/file/kt-540-map.jav
deleted file mode 100644
index 539c842981f..00000000000
--- a/tests/testData/ast/rawGenerics/file/kt-540-map.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo;
-
-import java.util.HashMap;
-
-class Test {
-  void main() {
-    HashMap<String, Integer> commonMap = new HashMap<String, Integer>();
-    HashMap rawMap = new HashMap<String, Integer>();
-    HashMap superRawMap = new HashMap();
-  }
-}
diff --git a/tests/testData/ast/rawGenerics/file/kt-540-map.kt b/tests/testData/ast/rawGenerics/file/kt-540-map.kt
deleted file mode 100644
index ce580f8680a..00000000000
--- a/tests/testData/ast/rawGenerics/file/kt-540-map.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo
-import java.util.HashMap
-open class Test() {
-open fun main() : Unit {
-var commonMap : HashMap<String?, Int?>? = HashMap<String?, Int?>()
-var rawMap : HashMap<Any?, Any?>? = HashMap<String?, Int?>()
-var superRawMap : HashMap<Any?, Any?>? = HashMap()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav b/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav
deleted file mode 100644
index 28e9ae350cc..00000000000
--- a/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav
+++ /dev/null
@@ -1,15 +0,0 @@
-package demo;
-
-class Collection<E> {
-  Collection(E e) {
-    System.out.println(e);
-  }
-}
-
-class Test {
-  void main() {
-    Collection raw1 = new Collection(1);
-    Collection raw2 = new Collection<Integer>(1);
-    Collection raw3 = new Collection<String>("1");
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt b/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
deleted file mode 100644
index 426b2190bc9..00000000000
--- a/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package demo
-open class Collection<E>(e : E?) {
-{
-System.out?.println(e)
-}
-}
-open class Test() {
-open fun main() : Unit {
-var raw1 : Collection<*>? = Collection(1)
-var raw2 : Collection<*>? = Collection<Int?>(1)
-var raw3 : Collection<*>? = Collection<String?>("1")
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540.jav b/tests/testData/ast/rawGenerics/file/kt-540.jav
deleted file mode 100644
index 6327874eab3..00000000000
--- a/tests/testData/ast/rawGenerics/file/kt-540.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-package demo;
-
-import java.util.List;
-import java.util.LinkedList;
-
-class Test {
-  void main() {
-    List<String> common = new LinkedList<String>();
-    List raw = new LinkedList<String>();
-    List superRaw = new LinkedList();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/kt-540.kt b/tests/testData/ast/rawGenerics/file/kt-540.kt
deleted file mode 100644
index 428297a628a..00000000000
--- a/tests/testData/ast/rawGenerics/file/kt-540.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package demo
-import java.util.LinkedList
-open class Test() {
-open fun main() : Unit {
-var common : MutableList<String?>? = LinkedList<String?>()
-var raw : MutableList<*>? = LinkedList<String?>()
-var superRaw : MutableList<*>? = LinkedList()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav b/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav
deleted file mode 100644
index 1303b4a305a..00000000000
--- a/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav
+++ /dev/null
@@ -1,14 +0,0 @@
-package demo;
-
-class TestT {
-  <T> void getT() { }
-}
-
-class U {
-  void main() {
-    TestT t = new TestT();
-    t.<String>getT();
-    t.<Integer>getT();
-    t.getT();
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/rawGenerics/file/rawGenericMethod.kt b/tests/testData/ast/rawGenerics/file/rawGenericMethod.kt
deleted file mode 100644
index ea3e08d5bdb..00000000000
--- a/tests/testData/ast/rawGenerics/file/rawGenericMethod.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package demo
-open class TestT() {
-open fun getT<T>() : Unit {
-}
-}
-open class U() {
-open fun main() : Unit {
-var t : TestT? = TestT()
-t?.getT<String?>()
-t?.getT<Int?>()
-t?.getT()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnChar.jav b/tests/testData/ast/returnStatement/statement/returnChar.jav
deleted file mode 100644
index d693916818c..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnChar.jav
+++ /dev/null
@@ -1 +0,0 @@
-return 'c';
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnChar.kt b/tests/testData/ast/returnStatement/statement/returnChar.kt
deleted file mode 100644
index b6284fba897..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnChar.kt
+++ /dev/null
@@ -1 +0,0 @@
-return 'c'
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnLiteral.jav b/tests/testData/ast/returnStatement/statement/returnLiteral.jav
deleted file mode 100644
index 5acac407ebf..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnLiteral.jav
+++ /dev/null
@@ -1 +0,0 @@
-return true;
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnLiteral.kt b/tests/testData/ast/returnStatement/statement/returnLiteral.kt
deleted file mode 100644
index 2a925639120..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnLiteral.kt
+++ /dev/null
@@ -1 +0,0 @@
-return true
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnNumber.jav b/tests/testData/ast/returnStatement/statement/returnNumber.jav
deleted file mode 100644
index eb224e0951e..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnNumber.jav
+++ /dev/null
@@ -1 +0,0 @@
-return 1;
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnNumber.kt b/tests/testData/ast/returnStatement/statement/returnNumber.kt
deleted file mode 100644
index 5efef616fdb..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnNumber.kt
+++ /dev/null
@@ -1 +0,0 @@
-return 1
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnString.jav b/tests/testData/ast/returnStatement/statement/returnString.jav
deleted file mode 100644
index b98a6ce7734..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnString.jav
+++ /dev/null
@@ -1 +0,0 @@
-return "str";
\ No newline at end of file
diff --git a/tests/testData/ast/returnStatement/statement/returnString.kt b/tests/testData/ast/returnStatement/statement/returnString.kt
deleted file mode 100644
index f831e0baf83..00000000000
--- a/tests/testData/ast/returnStatement/statement/returnString.kt
+++ /dev/null
@@ -1 +0,0 @@
-return "str"
\ No newline at end of file
diff --git a/tests/testData/ast/starProjectionType/method/methodParams.jav b/tests/testData/ast/starProjectionType/method/methodParams.jav
deleted file mode 100644
index 18d4217e0d9..00000000000
--- a/tests/testData/ast/starProjectionType/method/methodParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-void wtf(Collection<?> w) {}
\ No newline at end of file
diff --git a/tests/testData/ast/starProjectionType/method/methodParams.kt b/tests/testData/ast/starProjectionType/method/methodParams.kt
deleted file mode 100644
index 01ea4c15302..00000000000
--- a/tests/testData/ast/starProjectionType/method/methodParams.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun wtf(w : Collection<*>?) : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/superExpression/class/classAextendsB.jav b/tests/testData/ast/superExpression/class/classAextendsB.jav
deleted file mode 100644
index 6f07978fe79..00000000000
--- a/tests/testData/ast/superExpression/class/classAextendsB.jav
+++ /dev/null
@@ -1,12 +0,0 @@
-class B {
-  B(int i) {}
-  int call() {return 1;}
-}
-
-class A extends B {
-  A() {
-    super(10);
-  }
-
-  int call() { return super.call(); }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/superExpression/class/classAextendsB.kt b/tests/testData/ast/superExpression/class/classAextendsB.kt
deleted file mode 100644
index b9c5e29b288..00000000000
--- a/tests/testData/ast/superExpression/class/classAextendsB.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-open class B(i : Int) {
-open fun call() : Int {
-return 1
-}
-}
-open class A() : B(10) {
-override fun call() : Int {
-return super.call()
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav b/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav
deleted file mode 100644
index f53906b2c67..00000000000
--- a/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-class Base {
-  void foo();
-}
-
-class A extends Base {
-  class C {
-    void test() {
-      A.super.foo();
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/superExpression/file/classAdotSuperFoo.kt b/tests/testData/ast/superExpression/file/classAdotSuperFoo.kt
deleted file mode 100644
index a6495ce0571..00000000000
--- a/tests/testData/ast/superExpression/file/classAdotSuperFoo.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-open class Base() {
-open fun foo() : Unit
-}
-open class A() : Base() {
-open class C() {
-open fun test() : Unit {
-super@A.foo()
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/superExpression/statement/superStatement.jav b/tests/testData/ast/superExpression/statement/superStatement.jav
deleted file mode 100644
index 4b2f79a6823..00000000000
--- a/tests/testData/ast/superExpression/statement/superStatement.jav
+++ /dev/null
@@ -1 +0,0 @@
-super.call();
\ No newline at end of file
diff --git a/tests/testData/ast/superExpression/statement/superStatement.kt b/tests/testData/ast/superExpression/statement/superStatement.kt
deleted file mode 100644
index a0ea37bcc63..00000000000
--- a/tests/testData/ast/superExpression/statement/superStatement.kt
+++ /dev/null
@@ -1 +0,0 @@
-super.call()
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/comlicatedFallDown.jav b/tests/testData/ast/switch/file/comlicatedFallDown.jav
deleted file mode 100644
index 7bede23f75c..00000000000
--- a/tests/testData/ast/switch/file/comlicatedFallDown.jav
+++ /dev/null
@@ -1,32 +0,0 @@
-package demo;
-
-public class SwitchDemo {
-    public static void print(Object o) {
-        System.out.println(o);
-    }
-
-  public static void test(int i) {
-    String monthString = "<empty>";
-        switch (i) {
-            case 1:  print(1);
-            case 2:  print(2);
-            case 3:  print(3);
-            case 4:  print(4);
-            case 5:  print(5); break;
-            case 6:  print(6);
-            case 7:  print(7);
-            case 8:  print(8);
-            case 9:  print(9);
-            case 10: print(10);
-            case 11: print(11);
-            case 12: monthString = "December"; break;
-            default: monthString = "Invalid month"; break;
-        }
-        System.out.println(monthString);
-  }
-
-    public static void main(String[] args) {
-        for (int i = 1; i <=12 ; i++)
-          test(i);
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/comlicatedFallDown.kt b/tests/testData/ast/switch/file/comlicatedFallDown.kt
deleted file mode 100644
index ff998f92dc2..00000000000
--- a/tests/testData/ast/switch/file/comlicatedFallDown.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package demo
-public open class SwitchDemo() {
-class object {
-public open fun print(o : Any?) : Unit {
-System.out?.println(o)
-}
-public open fun test(i : Int) : Unit {
-var monthString : String? = "<empty>"
-when (i) {
-1 -> {
-print(1)
-print(2)
-print(3)
-print(4)
-print(5)
-}
-2 -> {
-print(2)
-print(3)
-print(4)
-print(5)
-}
-3 -> {
-print(3)
-print(4)
-print(5)
-}
-4 -> {
-print(4)
-print(5)
-}
-5 -> {
-print(5)
-}
-6 -> {
-print(6)
-print(7)
-print(8)
-print(9)
-print(10)
-print(11)
-monthString = "December"
-}
-7 -> {
-print(7)
-print(8)
-print(9)
-print(10)
-print(11)
-monthString = "December"
-}
-8 -> {
-print(8)
-print(9)
-print(10)
-print(11)
-monthString = "December"
-}
-9 -> {
-print(9)
-print(10)
-print(11)
-monthString = "December"
-}
-10 -> {
-print(10)
-print(11)
-monthString = "December"
-}
-11 -> {
-print(11)
-monthString = "December"
-}
-12 -> {
-monthString = "December"
-}
-else -> {
-monthString = "Invalid month"
-}
-}
-System.out?.println(monthString)
-}
-public open fun main(args : Array<String?>?) : Unit {
-for (i in 1..12) test(i)
-}
-}
-}
-fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/fallDown.jav b/tests/testData/ast/switch/file/fallDown.jav
deleted file mode 100644
index a6e4c557a72..00000000000
--- a/tests/testData/ast/switch/file/fallDown.jav
+++ /dev/null
@@ -1,24 +0,0 @@
-package switch_demo;
-
-public class SwitchDemo {
-    public static void main(String[] args) {
-        int month = 8;
-        String monthString;
-        switch (month) {
-            case 1:
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-            case 9:
-            case 10:
-            case 11:
-            case 12: monthString = "December"; break;
-            default: monthString = "Invalid month"; break;
-        }
-        System.out.println(monthString);
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/fallDown.kt b/tests/testData/ast/switch/file/fallDown.kt
deleted file mode 100644
index 35bb7e7576d..00000000000
--- a/tests/testData/ast/switch/file/fallDown.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package switch_demo
-public open class SwitchDemo() {
-class object {
-public open fun main(args : Array<String?>?) : Unit {
-var month : Int = 8
-var monthString : String?
-when (month) {
-1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> {
-monthString = "December"
-}
-else -> {
-monthString = "Invalid month"
-}
-}
-System.out?.println(monthString)
-}
-}
-}
-fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/kt-539.jav b/tests/testData/ast/switch/file/kt-539.jav
deleted file mode 100644
index 890eaa836e2..00000000000
--- a/tests/testData/ast/switch/file/kt-539.jav
+++ /dev/null
@@ -1,25 +0,0 @@
-package switch_demo;
-
-public class SwitchDemo {
-    public static void main(String[] args) {
-
-        int month = 8;
-        String monthString;
-        switch (month) {
-            case 1:  monthString = "January";       break;
-            case 2:  monthString = "February";      break;
-            case 3:  monthString = "March";         break;
-            case 4:  monthString = "April";         break;
-            case 5:  monthString = "May";           break;
-            case 6:  monthString = "June";          break;
-            case 7:  monthString = "July";          break;
-            case 8:  monthString = "August";        break;
-            case 9:  monthString = "September";     break;
-            case 10: monthString = "October";       break;
-            case 11: monthString = "November";      break;
-            case 12: monthString = "December";      break;
-            default: monthString = "Invalid month"; break;
-        }
-        System.out.println(monthString);
-    }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/switch/file/kt-539.kt b/tests/testData/ast/switch/file/kt-539.kt
deleted file mode 100644
index 4413070760e..00000000000
--- a/tests/testData/ast/switch/file/kt-539.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package switch_demo
-public open class SwitchDemo() {
-class object {
-public open fun main(args : Array<String?>?) : Unit {
-var month : Int = 8
-var monthString : String?
-when (month) {
-1 -> {
-monthString = "January"
-}
-2 -> {
-monthString = "February"
-}
-3 -> {
-monthString = "March"
-}
-4 -> {
-monthString = "April"
-}
-5 -> {
-monthString = "May"
-}
-6 -> {
-monthString = "June"
-}
-7 -> {
-monthString = "July"
-}
-8 -> {
-monthString = "August"
-}
-9 -> {
-monthString = "September"
-}
-10 -> {
-monthString = "October"
-}
-11 -> {
-monthString = "November"
-}
-12 -> {
-monthString = "December"
-}
-else -> {
-monthString = "Invalid month"
-}
-}
-System.out?.println(monthString)
-}
-}
-}
-fun main(args : Array<String>) = SwitchDemo.main(args as Array<String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav b/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav
deleted file mode 100644
index 4c4b01beee5..00000000000
--- a/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav
+++ /dev/null
@@ -1 +0,0 @@
-synchronized (s) { doSomething(s); }
\ No newline at end of file
diff --git a/tests/testData/ast/synchronizedStatement/statement/singleLineExample.kt b/tests/testData/ast/synchronizedStatement/statement/singleLineExample.kt
deleted file mode 100644
index 6665fbbba33..00000000000
--- a/tests/testData/ast/synchronizedStatement/statement/singleLineExample.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-synchronized (s) {
-doSomething(s)
-}
\ No newline at end of file
diff --git a/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav b/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav
deleted file mode 100644
index 6449695eb81..00000000000
--- a/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav
+++ /dev/null
@@ -1,11 +0,0 @@
-class Base {
-  void foo() {}
-}
-
-class A extends Base {
-  class C {
-    void test() {
-      A.this.foo();
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/testData/ast/thisExpression/file/classAdotThisFoo.kt b/tests/testData/ast/thisExpression/file/classAdotThisFoo.kt
deleted file mode 100644
index 615b3b5dc0a..00000000000
--- a/tests/testData/ast/thisExpression/file/classAdotThisFoo.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-open class Base() {
-open fun foo() : Unit {
-}
-}
-open class A() : Base() {
-open class C() {
-open fun test() : Unit {
-this@A.foo()
-}
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/thisExpression/statement/thisStatement.jav b/tests/testData/ast/thisExpression/statement/thisStatement.jav
deleted file mode 100644
index 4b2f79a6823..00000000000
--- a/tests/testData/ast/thisExpression/statement/thisStatement.jav
+++ /dev/null
@@ -1 +0,0 @@
-super.call();
\ No newline at end of file
diff --git a/tests/testData/ast/thisExpression/statement/thisStatement.kt b/tests/testData/ast/thisExpression/statement/thisStatement.kt
deleted file mode 100644
index a0ea37bcc63..00000000000
--- a/tests/testData/ast/thisExpression/statement/thisStatement.kt
+++ /dev/null
@@ -1 +0,0 @@
-super.call()
\ No newline at end of file
diff --git a/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav b/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav
deleted file mode 100644
index 2d879427e7c..00000000000
--- a/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav
+++ /dev/null
@@ -1 +0,0 @@
-throw exception;
\ No newline at end of file
diff --git a/tests/testData/ast/throwStatement/statement/simpleThrowStatement.kt b/tests/testData/ast/throwStatement/statement/simpleThrowStatement.kt
deleted file mode 100644
index 0894cfeda14..00000000000
--- a/tests/testData/ast/throwStatement/statement/simpleThrowStatement.kt
+++ /dev/null
@@ -1 +0,0 @@
-throw exception
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/abstactInterface.jav b/tests/testData/ast/trait/class/abstactInterface.jav
deleted file mode 100644
index 17b89868943..00000000000
--- a/tests/testData/ast/trait/class/abstactInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-abstract interface I {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/abstactInterface.kt b/tests/testData/ast/trait/class/abstactInterface.kt
deleted file mode 100644
index 97c0b5c0bed..00000000000
--- a/tests/testData/ast/trait/class/abstactInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-abstract trait I {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/emptyInterface.jav b/tests/testData/ast/trait/class/emptyInterface.jav
deleted file mode 100644
index 0bdb5912e9b..00000000000
--- a/tests/testData/ast/trait/class/emptyInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface A {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/emptyInterface.kt b/tests/testData/ast/trait/class/emptyInterface.kt
deleted file mode 100644
index 670cabdb241..00000000000
--- a/tests/testData/ast/trait/class/emptyInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-trait A {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav
deleted file mode 100644
index f0434f0b324..00000000000
--- a/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface A extends I0, I1, I2 {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt
deleted file mode 100644
index 3bbc299803d..00000000000
--- a/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-trait A : I0, I1, I2 {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/extendsOneInterface.jav b/tests/testData/ast/trait/class/extendsOneInterface.jav
deleted file mode 100644
index fdd7b33cb4b..00000000000
--- a/tests/testData/ast/trait/class/extendsOneInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface A extends I {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/extendsOneInterface.kt b/tests/testData/ast/trait/class/extendsOneInterface.kt
deleted file mode 100644
index a5d59a56576..00000000000
--- a/tests/testData/ast/trait/class/extendsOneInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-trait A : I {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/interfaceWithFields.jav b/tests/testData/ast/trait/class/interfaceWithFields.jav
deleted file mode 100644
index 5fdf82bfa6c..00000000000
--- a/tests/testData/ast/trait/class/interfaceWithFields.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface INode {String IN = "in";String AT = "@";String COMMA_WITH_SPACE = COMMA + SPACE;}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/interfaceWithFields.kt b/tests/testData/ast/trait/class/interfaceWithFields.kt
deleted file mode 100644
index f8fdfeacaf4..00000000000
--- a/tests/testData/ast/trait/class/interfaceWithFields.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-trait INode {
-class object {
-val IN : String = "in"
-val AT : String = "@"
-val COMMA_WITH_SPACE : String? = COMMA + SPACE
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav b/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav
deleted file mode 100644
index 4023476a76e..00000000000
--- a/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface INode {Tag getTag();String toKotlin();}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.kt b/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.kt
deleted file mode 100644
index aff8b40c610..00000000000
--- a/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-trait INode {
-open fun getTag() : Tag?
-open fun toKotlin() : String?
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/interfaceWithStaticFields.jav b/tests/testData/ast/trait/class/interfaceWithStaticFields.jav
deleted file mode 100644
index 831ea008a23..00000000000
--- a/tests/testData/ast/trait/class/interfaceWithStaticFields.jav
+++ /dev/null
@@ -1 +0,0 @@
-public interface INode {  public static final String IN = "in";  public static final String AT = "@";  public static final String COMMA_WITH_SPACE = COMMA + SPACE;}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/interfaceWithStaticFields.kt b/tests/testData/ast/trait/class/interfaceWithStaticFields.kt
deleted file mode 100644
index 0f1ab7c26f1..00000000000
--- a/tests/testData/ast/trait/class/interfaceWithStaticFields.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-public trait INode {
-class object {
-public val IN : String = "in"
-public val AT : String = "@"
-public val COMMA_WITH_SPACE : String? = COMMA + SPACE
-}
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/internalInterface.jav b/tests/testData/ast/trait/class/internalInterface.jav
deleted file mode 100644
index 6afccc2f169..00000000000
--- a/tests/testData/ast/trait/class/internalInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/internalInterface.kt b/tests/testData/ast/trait/class/internalInterface.kt
deleted file mode 100644
index 802809a5724..00000000000
--- a/tests/testData/ast/trait/class/internalInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-trait Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/privateInterface.jav b/tests/testData/ast/trait/class/privateInterface.jav
deleted file mode 100644
index cf33d97c99c..00000000000
--- a/tests/testData/ast/trait/class/privateInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-private interface Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/privateInterface.kt b/tests/testData/ast/trait/class/privateInterface.kt
deleted file mode 100644
index 72942402d0b..00000000000
--- a/tests/testData/ast/trait/class/privateInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-private trait Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/protectedInterface.jav b/tests/testData/ast/trait/class/protectedInterface.jav
deleted file mode 100644
index e91d5694021..00000000000
--- a/tests/testData/ast/trait/class/protectedInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-protected interface Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/protectedInterface.kt b/tests/testData/ast/trait/class/protectedInterface.kt
deleted file mode 100644
index 359d3b99929..00000000000
--- a/tests/testData/ast/trait/class/protectedInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-protected trait Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/publicInterface.jav b/tests/testData/ast/trait/class/publicInterface.jav
deleted file mode 100644
index 19c4ff3a675..00000000000
--- a/tests/testData/ast/trait/class/publicInterface.jav
+++ /dev/null
@@ -1 +0,0 @@
-public interface Test {}
\ No newline at end of file
diff --git a/tests/testData/ast/trait/class/publicInterface.kt b/tests/testData/ast/trait/class/publicInterface.kt
deleted file mode 100644
index 14565fbd6b3..00000000000
--- a/tests/testData/ast/trait/class/publicInterface.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-public trait Test {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav b/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav
deleted file mode 100644
index ba4d634d21b..00000000000
--- a/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav
+++ /dev/null
@@ -1 +0,0 @@
-try {    callMethod(params);} catch (Exception e) {    println(1);} catch (IOException e) {    println(0);} finally {    println(3);}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt b/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
deleted file mode 100644
index ce5da7da296..00000000000
--- a/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-try
-{
-callMethod(params)
-}
-catch (e : Exception) {
-println(1)
-}
-catch (e : IOException) {
-println(0)
-}
-finally
-{
-println(3)
-}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav
deleted file mode 100644
index f334b56c36a..00000000000
--- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav
+++ /dev/null
@@ -1 +0,0 @@
-try {} catch (Exception e) {    println(1);} catch (IOException e) {    println(0);} finally {}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
deleted file mode 100644
index 40e83f0667f..00000000000
--- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-try
-{
-}
-catch (e : Exception) {
-println(1)
-}
-catch (e : IOException) {
-println(0)
-}
-finally
-{
-}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav
deleted file mode 100644
index 9658c4120c2..00000000000
--- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav
+++ /dev/null
@@ -1 +0,0 @@
-try {} catch (Exception e) {    println(1);} catch (IOException e) {    println(0);} finally {    println(3);}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
deleted file mode 100644
index 92e60f280d4..00000000000
--- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-try
-{
-}
-catch (e : Exception) {
-println(1)
-}
-catch (e : IOException) {
-println(0)
-}
-finally
-{
-println(3)
-}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav
deleted file mode 100644
index 5e85a85b378..00000000000
--- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav
+++ /dev/null
@@ -1 +0,0 @@
-try {} catch (Exception e) {    println(1);} catch (IOException e) {    println(0);}
\ No newline at end of file
diff --git a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt b/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
deleted file mode 100644
index 2f5deb07c0b..00000000000
--- a/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-try
-{
-}
-catch (e : Exception) {
-println(1)
-}
-catch (e : IOException) {
-println(0)
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav b/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav
deleted file mode 100644
index c19f94da6e8..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(List<? extends String>)list
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt b/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt
deleted file mode 100644
index 05db17e423f..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt
+++ /dev/null
@@ -1 +0,0 @@
-(list as List<out String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/fooCast.jav b/tests/testData/ast/typeCastExpression/expression/fooCast.jav
deleted file mode 100644
index 8edd243486a..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/fooCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(Foo)t
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/fooCast.kt b/tests/testData/ast/typeCastExpression/expression/fooCast.kt
deleted file mode 100644
index 109689e1240..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/fooCast.kt
+++ /dev/null
@@ -1 +0,0 @@
-(t as Foo?)
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/intCast.jav b/tests/testData/ast/typeCastExpression/expression/intCast.jav
deleted file mode 100644
index c000fb4d468..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/intCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(int)t
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/intCast.kt b/tests/testData/ast/typeCastExpression/expression/intCast.kt
deleted file mode 100644
index 28dc4fc3816..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/intCast.kt
+++ /dev/null
@@ -1 +0,0 @@
-(t as Int)
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/primitiveType.jav b/tests/testData/ast/typeCastExpression/expression/primitiveType.jav
deleted file mode 100644
index a9cc54cd6b8..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/primitiveType.jav
+++ /dev/null
@@ -1 +0,0 @@
-(int)100.00;
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/primitiveType.kt b/tests/testData/ast/typeCastExpression/expression/primitiveType.kt
deleted file mode 100644
index e312f02e742..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/primitiveType.kt
+++ /dev/null
@@ -1 +0,0 @@
-100.00.toInt()
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav b/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav
deleted file mode 100644
index cdfdd30aea4..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(List<Expression>)list
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.kt b/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.kt
deleted file mode 100644
index c48c5d7637d..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.kt
+++ /dev/null
@@ -1 +0,0 @@
-(list as List<Expression?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/stringCast.jav b/tests/testData/ast/typeCastExpression/expression/stringCast.jav
deleted file mode 100644
index b4cf91cf340..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/stringCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(String)t
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/stringCast.kt b/tests/testData/ast/typeCastExpression/expression/stringCast.kt
deleted file mode 100644
index a2020f03831..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/stringCast.kt
+++ /dev/null
@@ -1 +0,0 @@
-(t as String?)
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav b/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav
deleted file mode 100644
index c197fc42e15..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(List<? super String>)list
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/superWildcardCast.kt b/tests/testData/ast/typeCastExpression/expression/superWildcardCast.kt
deleted file mode 100644
index 1bc5cd16259..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/superWildcardCast.kt
+++ /dev/null
@@ -1 +0,0 @@
-(list as List<in String?>?)
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav b/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav
deleted file mode 100644
index 38bd7a07f97..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(List<?>)list
\ No newline at end of file
diff --git a/tests/testData/ast/typeCastExpression/expression/wildcardCast.kt b/tests/testData/ast/typeCastExpression/expression/wildcardCast.kt
deleted file mode 100644
index 47484fba27b..00000000000
--- a/tests/testData/ast/typeCastExpression/expression/wildcardCast.kt
+++ /dev/null
@@ -1 +0,0 @@
-(list as List<*>?)
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav b/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav
deleted file mode 100644
index c576f7f0633..00000000000
--- a/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class CC <T extends INode & Comparable<? super T>, K extends Node & Collection<? super K>> extends A {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt
deleted file mode 100644
index f40a6cda574..00000000000
--- a/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class CC<T : INode?, K : Node?>() : A() where T : Comparable<in T?>?, K : Collection<in K?>? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav b/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav
deleted file mode 100644
index 9794cb4338c..00000000000
--- a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class C<T extends INode & Comparable<? super T>> {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt b/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt
deleted file mode 100644
index e6fa0f4ce21..00000000000
--- a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class C<T : INode?>() where T : Comparable<in T?>? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav b/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav
deleted file mode 100644
index aaea17bff62..00000000000
--- a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class C<T extends INode & Comparable<? super T>> extends A {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt b/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt
deleted file mode 100644
index e05e75db415..00000000000
--- a/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class C<T : INode?>() : A() where T : Comparable<in T?>? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav b/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav
deleted file mode 100644
index d23995b68a2..00000000000
--- a/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface CommandHandler<T extends Command> {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt b/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt
deleted file mode 100644
index 077c6618b24..00000000000
--- a/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-trait CommandHandler<T : Command?> {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav b/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav
deleted file mode 100644
index 8d1c87481ff..00000000000
--- a/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface CommandHandler<T extends INode, String> {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt b/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt
deleted file mode 100644
index 4c3fd7537b6..00000000000
--- a/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-trait CommandHandler<T : INode?, String> {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/genericClass.jav b/tests/testData/ast/typeParameters/class/genericClass.jav
deleted file mode 100644
index 10066e3b55d..00000000000
--- a/tests/testData/ast/typeParameters/class/genericClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-final class Comparable<T> {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/genericClass.kt b/tests/testData/ast/typeParameters/class/genericClass.kt
deleted file mode 100644
index dd8d1147200..00000000000
--- a/tests/testData/ast/typeParameters/class/genericClass.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-class Comparable<T>() {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav b/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav
deleted file mode 100644
index 533a138632d..00000000000
--- a/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav
+++ /dev/null
@@ -1 +0,0 @@
-interface I <T extends INode & Comparable<? super T>, K extends Node & Collection<? super K>> extends II {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
deleted file mode 100644
index f73bbabea8b..00000000000
--- a/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-trait I<T : INode?, K : Node?> : II where T : Comparable<in T?>?, K : Collection<in K?>? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav b/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav
deleted file mode 100644
index 40ab13a5851..00000000000
--- a/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav
+++ /dev/null
@@ -1 +0,0 @@
-<T extends Object & Comparable<? super T>, K extends Node & Collection<? super K>> T max(Collection<? extends T> coll) {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt b/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt
deleted file mode 100644
index 21f892b7d8d..00000000000
--- a/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun max<T : Any?, K : Node?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>?, K : Collection<in K?>? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/method/where.jav b/tests/testData/ast/typeParameters/method/where.jav
deleted file mode 100644
index 20bb1bf62fd..00000000000
--- a/tests/testData/ast/typeParameters/method/where.jav
+++ /dev/null
@@ -1 +0,0 @@
-<T extends Object & Comparable<? super T>> T max(Collection<? extends T> coll) {}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/method/where.kt b/tests/testData/ast/typeParameters/method/where.kt
deleted file mode 100644
index 6a1ccaeeec6..00000000000
--- a/tests/testData/ast/typeParameters/method/where.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun max<T : Any?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>? {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/statement/genericParam.jav b/tests/testData/ast/typeParameters/statement/genericParam.jav
deleted file mode 100644
index 89c94caafda..00000000000
--- a/tests/testData/ast/typeParameters/statement/genericParam.jav
+++ /dev/null
@@ -1 +0,0 @@
-List<T> l;
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/statement/genericParam.kt b/tests/testData/ast/typeParameters/statement/genericParam.kt
deleted file mode 100644
index 53f9c91dba7..00000000000
--- a/tests/testData/ast/typeParameters/statement/genericParam.kt
+++ /dev/null
@@ -1 +0,0 @@
-var l : List<T?>?
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/statement/manyGenericParams.jav b/tests/testData/ast/typeParameters/statement/manyGenericParams.jav
deleted file mode 100644
index 65eb2f4ca9d..00000000000
--- a/tests/testData/ast/typeParameters/statement/manyGenericParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-List<T, K, M> l;
\ No newline at end of file
diff --git a/tests/testData/ast/typeParameters/statement/manyGenericParams.kt b/tests/testData/ast/typeParameters/statement/manyGenericParams.kt
deleted file mode 100644
index 007056e4c03..00000000000
--- a/tests/testData/ast/typeParameters/statement/manyGenericParams.kt
+++ /dev/null
@@ -1 +0,0 @@
-var l : List<T?, K?, M?>?
\ No newline at end of file
diff --git a/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav b/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav
deleted file mode 100644
index 46bdd2765ee..00000000000
--- a/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-String format(String pattern, Object... arguments);
\ No newline at end of file
diff --git a/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt b/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt
deleted file mode 100644
index 78207eee74b..00000000000
--- a/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun format(pattern : String?, vararg arguments : Any?) : String?
\ No newline at end of file
diff --git a/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav b/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav
deleted file mode 100644
index 2c1f529675e..00000000000
--- a/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav
+++ /dev/null
@@ -1 +0,0 @@
-void pushAll(Object... objs) {}
\ No newline at end of file
diff --git a/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.kt b/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.kt
deleted file mode 100644
index 5219629e1e3..00000000000
--- a/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun pushAll(vararg objs : Any?) : Unit {
-}
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithBlock.jav b/tests/testData/ast/whileStatement/statement/whileWithBlock.jav
deleted file mode 100644
index 729a9e5f6f7..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithBlock.jav
+++ /dev/null
@@ -1 +0,0 @@
-while (a > b) {int i = 1; i = i + 1;}
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithBlock.kt b/tests/testData/ast/whileStatement/statement/whileWithBlock.kt
deleted file mode 100644
index 88e9992f59a..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithBlock.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-while (a > b)
-{
-var i : Int = 1
-i = i + 1
-}
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav b/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav
deleted file mode 100644
index 5055fb08ee2..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav
+++ /dev/null
@@ -1 +0,0 @@
-while (true) {}
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt b/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt
deleted file mode 100644
index 7c69899ce77..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-while (true)
-{
-}
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithExpression.jav b/tests/testData/ast/whileStatement/statement/whileWithExpression.jav
deleted file mode 100644
index b0e6f1b9b32..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithExpression.jav
+++ /dev/null
@@ -1 +0,0 @@
-while (true) i = i + 1;
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithExpression.kt b/tests/testData/ast/whileStatement/statement/whileWithExpression.kt
deleted file mode 100644
index fd2a7536a52..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithExpression.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-while (true)
-i = i + 1
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithReturn.jav b/tests/testData/ast/whileStatement/statement/whileWithReturn.jav
deleted file mode 100644
index 2174fc827bd..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithReturn.jav
+++ /dev/null
@@ -1 +0,0 @@
-while (true) return 1;
\ No newline at end of file
diff --git a/tests/testData/ast/whileStatement/statement/whileWithReturn.kt b/tests/testData/ast/whileStatement/statement/whileWithReturn.kt
deleted file mode 100644
index ec1e88ceed8..00000000000
--- a/tests/testData/ast/whileStatement/statement/whileWithReturn.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-while (true)
-return 1
\ No newline at end of file