diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java index 2fec5296537..ad3a83f7589 100644 --- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java +++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java @@ -95,7 +95,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase { public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(TestCaseBuilder.suiteForDirectory(getTestDataPathBase(), "", true, new TestCaseBuilder.NamedTestFactory() { + suite.addTest(TestCaseBuilder.suiteForDirectory(getTestDataPathBase(), "/ast", true, new TestCaseBuilder.NamedTestFactory() { @NotNull @Override public Test createTest(@NotNull String dataPath, @NotNull String name) { diff --git a/testData/arrayAccessExpression/expression/expressionIndex.jav b/testData/ast/arrayAccessExpression/expression/expressionIndex.jav similarity index 100% rename from testData/arrayAccessExpression/expression/expressionIndex.jav rename to testData/ast/arrayAccessExpression/expression/expressionIndex.jav diff --git a/testData/arrayAccessExpression/expression/expressionIndex.kt b/testData/ast/arrayAccessExpression/expression/expressionIndex.kt similarity index 100% rename from testData/arrayAccessExpression/expression/expressionIndex.kt rename to testData/ast/arrayAccessExpression/expression/expressionIndex.kt diff --git a/testData/arrayAccessExpression/expression/intIndex.jav b/testData/ast/arrayAccessExpression/expression/intIndex.jav similarity index 100% rename from testData/arrayAccessExpression/expression/intIndex.jav rename to testData/ast/arrayAccessExpression/expression/intIndex.jav diff --git a/testData/arrayAccessExpression/expression/intIndex.kt b/testData/ast/arrayAccessExpression/expression/intIndex.kt similarity index 100% rename from testData/arrayAccessExpression/expression/intIndex.kt rename to testData/ast/arrayAccessExpression/expression/intIndex.kt diff --git a/testData/arrayAccessExpression/expression/variableIndex.jav b/testData/ast/arrayAccessExpression/expression/variableIndex.jav similarity index 100% rename from testData/arrayAccessExpression/expression/variableIndex.jav rename to testData/ast/arrayAccessExpression/expression/variableIndex.jav diff --git a/testData/arrayAccessExpression/expression/variableIndex.kt b/testData/ast/arrayAccessExpression/expression/variableIndex.kt similarity index 100% rename from testData/arrayAccessExpression/expression/variableIndex.kt rename to testData/ast/arrayAccessExpression/expression/variableIndex.kt diff --git a/testData/arrayInitializerExpression/expression/newInt.jav b/testData/ast/arrayInitializerExpression/expression/newInt.jav similarity index 100% rename from testData/arrayInitializerExpression/expression/newInt.jav rename to testData/ast/arrayInitializerExpression/expression/newInt.jav diff --git a/testData/arrayInitializerExpression/expression/newInt.kt b/testData/ast/arrayInitializerExpression/expression/newInt.kt similarity index 100% rename from testData/arrayInitializerExpression/expression/newInt.kt rename to testData/ast/arrayInitializerExpression/expression/newInt.kt diff --git a/testData/arrayInitializerExpression/expression/oneDim.jav b/testData/ast/arrayInitializerExpression/expression/oneDim.jav similarity index 100% rename from testData/arrayInitializerExpression/expression/oneDim.jav rename to testData/ast/arrayInitializerExpression/expression/oneDim.jav diff --git a/testData/arrayInitializerExpression/expression/oneDim.kt b/testData/ast/arrayInitializerExpression/expression/oneDim.kt similarity index 100% rename from testData/arrayInitializerExpression/expression/oneDim.kt rename to testData/ast/arrayInitializerExpression/expression/oneDim.kt diff --git a/testData/arrayInitializerExpression/expression/oneDimWithVariables.jav b/testData/ast/arrayInitializerExpression/expression/oneDimWithVariables.jav similarity index 100% rename from testData/arrayInitializerExpression/expression/oneDimWithVariables.jav rename to testData/ast/arrayInitializerExpression/expression/oneDimWithVariables.jav diff --git a/testData/arrayInitializerExpression/expression/oneDimWithVariables.kt b/testData/ast/arrayInitializerExpression/expression/oneDimWithVariables.kt similarity index 100% rename from testData/arrayInitializerExpression/expression/oneDimWithVariables.kt rename to testData/ast/arrayInitializerExpression/expression/oneDimWithVariables.kt diff --git a/testData/arrayInitializerExpression/expression/twoDim.jav b/testData/ast/arrayInitializerExpression/expression/twoDim.jav similarity index 100% rename from testData/arrayInitializerExpression/expression/twoDim.jav rename to testData/ast/arrayInitializerExpression/expression/twoDim.jav diff --git a/testData/arrayInitializerExpression/expression/twoDim.kt b/testData/ast/arrayInitializerExpression/expression/twoDim.kt similarity index 100% rename from testData/arrayInitializerExpression/expression/twoDim.kt rename to testData/ast/arrayInitializerExpression/expression/twoDim.kt diff --git a/testData/arrayType/method/methodArrayArgs.jav b/testData/ast/arrayType/method/methodArrayArgs.jav similarity index 100% rename from testData/arrayType/method/methodArrayArgs.jav rename to testData/ast/arrayType/method/methodArrayArgs.jav diff --git a/testData/arrayType/method/methodArrayArgs.kt b/testData/ast/arrayType/method/methodArrayArgs.kt similarity index 100% rename from testData/arrayType/method/methodArrayArgs.kt rename to testData/ast/arrayType/method/methodArrayArgs.kt diff --git a/testData/arrayType/statement/arrayInitializationStatement.jav b/testData/ast/arrayType/statement/arrayInitializationStatement.jav similarity index 100% rename from testData/arrayType/statement/arrayInitializationStatement.jav rename to testData/ast/arrayType/statement/arrayInitializationStatement.jav diff --git a/testData/arrayType/statement/arrayInitializationStatement.kt b/testData/ast/arrayType/statement/arrayInitializationStatement.kt similarity index 100% rename from testData/arrayType/statement/arrayInitializationStatement.kt rename to testData/ast/arrayType/statement/arrayInitializationStatement.kt diff --git a/testData/arrayType/statement/arrayInitializationStatementWithDimension.jav b/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav similarity index 100% rename from testData/arrayType/statement/arrayInitializationStatementWithDimension.jav rename to testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav diff --git a/testData/arrayType/statement/arrayInitializationStatementWithDimension.kt b/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt similarity index 100% rename from testData/arrayType/statement/arrayInitializationStatementWithDimension.kt rename to testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt diff --git a/testData/arrayType/statement_mult/doubleArray.jav b/testData/ast/arrayType/statement_mult/doubleArray.jav similarity index 100% rename from testData/arrayType/statement_mult/doubleArray.jav rename to testData/ast/arrayType/statement_mult/doubleArray.jav diff --git a/testData/arrayType/statement_mult/doubleArray.kt b/testData/ast/arrayType/statement_mult/doubleArray.kt similarity index 100% rename from testData/arrayType/statement_mult/doubleArray.kt rename to testData/ast/arrayType/statement_mult/doubleArray.kt diff --git a/testData/arrayType/statement_mult/longArray.jav b/testData/ast/arrayType/statement_mult/longArray.jav similarity index 100% rename from testData/arrayType/statement_mult/longArray.jav rename to testData/ast/arrayType/statement_mult/longArray.jav diff --git a/testData/arrayType/statement_mult/longArray.kt b/testData/ast/arrayType/statement_mult/longArray.kt similarity index 100% rename from testData/arrayType/statement_mult/longArray.kt rename to testData/ast/arrayType/statement_mult/longArray.kt diff --git a/testData/arrayType/statement_mult/newIntArray.jav b/testData/ast/arrayType/statement_mult/newIntArray.jav similarity index 100% rename from testData/arrayType/statement_mult/newIntArray.jav rename to testData/ast/arrayType/statement_mult/newIntArray.jav diff --git a/testData/arrayType/statement_mult/newIntArray.kt b/testData/ast/arrayType/statement_mult/newIntArray.kt similarity index 100% rename from testData/arrayType/statement_mult/newIntArray.kt rename to testData/ast/arrayType/statement_mult/newIntArray.kt diff --git a/testData/arrayType/statement_mult/newStringArray.jav b/testData/ast/arrayType/statement_mult/newStringArray.jav similarity index 100% rename from testData/arrayType/statement_mult/newStringArray.jav rename to testData/ast/arrayType/statement_mult/newStringArray.jav diff --git a/testData/arrayType/statement_mult/newStringArray.kt b/testData/ast/arrayType/statement_mult/newStringArray.kt similarity index 100% rename from testData/arrayType/statement_mult/newStringArray.kt rename to testData/ast/arrayType/statement_mult/newStringArray.kt diff --git a/testData/assertStatement/statement_mult/onlyCondition.jav b/testData/ast/assertStatement/statement_mult/onlyCondition.jav similarity index 100% rename from testData/assertStatement/statement_mult/onlyCondition.jav rename to testData/ast/assertStatement/statement_mult/onlyCondition.jav diff --git a/testData/assertStatement/statement_mult/onlyCondition.kt b/testData/ast/assertStatement/statement_mult/onlyCondition.kt similarity index 100% rename from testData/assertStatement/statement_mult/onlyCondition.kt rename to testData/ast/assertStatement/statement_mult/onlyCondition.kt diff --git a/testData/assertStatement/statement_mult/onlyConditionWithBraces.jav b/testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.jav similarity index 100% rename from testData/assertStatement/statement_mult/onlyConditionWithBraces.jav rename to testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.jav diff --git a/testData/assertStatement/statement_mult/onlyConditionWithBraces.kt b/testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.kt similarity index 100% rename from testData/assertStatement/statement_mult/onlyConditionWithBraces.kt rename to testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.kt diff --git a/testData/assertStatement/statement_mult/withStringDetail.jav b/testData/ast/assertStatement/statement_mult/withStringDetail.jav similarity index 100% rename from testData/assertStatement/statement_mult/withStringDetail.jav rename to testData/ast/assertStatement/statement_mult/withStringDetail.jav diff --git a/testData/assertStatement/statement_mult/withStringDetail.kt b/testData/ast/assertStatement/statement_mult/withStringDetail.kt similarity index 100% rename from testData/assertStatement/statement_mult/withStringDetail.kt rename to testData/ast/assertStatement/statement_mult/withStringDetail.kt diff --git a/testData/assignmentExpression/expression_mult/and.jav b/testData/ast/assignmentExpression/expression_mult/and.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/and.jav rename to testData/ast/assignmentExpression/expression_mult/and.jav diff --git a/testData/assignmentExpression/expression_mult/and.kt b/testData/ast/assignmentExpression/expression_mult/and.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/and.kt rename to testData/ast/assignmentExpression/expression_mult/and.kt diff --git a/testData/assignmentExpression/expression_mult/assignment.jav b/testData/ast/assignmentExpression/expression_mult/assignment.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/assignment.jav rename to testData/ast/assignmentExpression/expression_mult/assignment.jav diff --git a/testData/assignmentExpression/expression_mult/assignment.kt b/testData/ast/assignmentExpression/expression_mult/assignment.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/assignment.kt rename to testData/ast/assignmentExpression/expression_mult/assignment.kt diff --git a/testData/assignmentExpression/expression_mult/divideAssign.jav b/testData/ast/assignmentExpression/expression_mult/divideAssign.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/divideAssign.jav rename to testData/ast/assignmentExpression/expression_mult/divideAssign.jav diff --git a/testData/assignmentExpression/expression_mult/divideAssign.kt b/testData/ast/assignmentExpression/expression_mult/divideAssign.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/divideAssign.kt rename to testData/ast/assignmentExpression/expression_mult/divideAssign.kt diff --git a/testData/assignmentExpression/expression_mult/minusAssign.jav b/testData/ast/assignmentExpression/expression_mult/minusAssign.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/minusAssign.jav rename to testData/ast/assignmentExpression/expression_mult/minusAssign.jav diff --git a/testData/assignmentExpression/expression_mult/minusAssign.kt b/testData/ast/assignmentExpression/expression_mult/minusAssign.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/minusAssign.kt rename to testData/ast/assignmentExpression/expression_mult/minusAssign.kt diff --git a/testData/assignmentExpression/expression_mult/multiplyAssign.jav b/testData/ast/assignmentExpression/expression_mult/multiplyAssign.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/multiplyAssign.jav rename to testData/ast/assignmentExpression/expression_mult/multiplyAssign.jav diff --git a/testData/assignmentExpression/expression_mult/multiplyAssign.kt b/testData/ast/assignmentExpression/expression_mult/multiplyAssign.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/multiplyAssign.kt rename to testData/ast/assignmentExpression/expression_mult/multiplyAssign.kt diff --git a/testData/assignmentExpression/expression_mult/or.jav b/testData/ast/assignmentExpression/expression_mult/or.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/or.jav rename to testData/ast/assignmentExpression/expression_mult/or.jav diff --git a/testData/assignmentExpression/expression_mult/or.kt b/testData/ast/assignmentExpression/expression_mult/or.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/or.kt rename to testData/ast/assignmentExpression/expression_mult/or.kt diff --git a/testData/assignmentExpression/expression_mult/plusAssign.jav b/testData/ast/assignmentExpression/expression_mult/plusAssign.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/plusAssign.jav rename to testData/ast/assignmentExpression/expression_mult/plusAssign.jav diff --git a/testData/assignmentExpression/expression_mult/plusAssign.kt b/testData/ast/assignmentExpression/expression_mult/plusAssign.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/plusAssign.kt rename to testData/ast/assignmentExpression/expression_mult/plusAssign.kt diff --git a/testData/assignmentExpression/expression_mult/reminder.jav b/testData/ast/assignmentExpression/expression_mult/reminder.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/reminder.jav rename to testData/ast/assignmentExpression/expression_mult/reminder.jav diff --git a/testData/assignmentExpression/expression_mult/reminder.kt b/testData/ast/assignmentExpression/expression_mult/reminder.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/reminder.kt rename to testData/ast/assignmentExpression/expression_mult/reminder.kt diff --git a/testData/assignmentExpression/expression_mult/shiftLeft.jav b/testData/ast/assignmentExpression/expression_mult/shiftLeft.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/shiftLeft.jav rename to testData/ast/assignmentExpression/expression_mult/shiftLeft.jav diff --git a/testData/assignmentExpression/expression_mult/shiftLeft.kt b/testData/ast/assignmentExpression/expression_mult/shiftLeft.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/shiftLeft.kt rename to testData/ast/assignmentExpression/expression_mult/shiftLeft.kt diff --git a/testData/assignmentExpression/expression_mult/shiftRight.jav b/testData/ast/assignmentExpression/expression_mult/shiftRight.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/shiftRight.jav rename to testData/ast/assignmentExpression/expression_mult/shiftRight.jav diff --git a/testData/assignmentExpression/expression_mult/shiftRight.kt b/testData/ast/assignmentExpression/expression_mult/shiftRight.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/shiftRight.kt rename to testData/ast/assignmentExpression/expression_mult/shiftRight.kt diff --git a/testData/assignmentExpression/expression_mult/unsignedRightShift.jav b/testData/ast/assignmentExpression/expression_mult/unsignedRightShift.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/unsignedRightShift.jav rename to testData/ast/assignmentExpression/expression_mult/unsignedRightShift.jav diff --git a/testData/assignmentExpression/expression_mult/unsignedRightShift.kt b/testData/ast/assignmentExpression/expression_mult/unsignedRightShift.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/unsignedRightShift.kt rename to testData/ast/assignmentExpression/expression_mult/unsignedRightShift.kt diff --git a/testData/assignmentExpression/expression_mult/xor.jav b/testData/ast/assignmentExpression/expression_mult/xor.jav similarity index 100% rename from testData/assignmentExpression/expression_mult/xor.jav rename to testData/ast/assignmentExpression/expression_mult/xor.jav diff --git a/testData/assignmentExpression/expression_mult/xor.kt b/testData/ast/assignmentExpression/expression_mult/xor.kt similarity index 100% rename from testData/assignmentExpression/expression_mult/xor.kt rename to testData/ast/assignmentExpression/expression_mult/xor.kt diff --git a/testData/assignmentExpression/statement/simpleAssignment.jav b/testData/ast/assignmentExpression/statement/simpleAssignment.jav similarity index 100% rename from testData/assignmentExpression/statement/simpleAssignment.jav rename to testData/ast/assignmentExpression/statement/simpleAssignment.jav diff --git a/testData/assignmentExpression/statement/simpleAssignment.kt b/testData/ast/assignmentExpression/statement/simpleAssignment.kt similarity index 100% rename from testData/assignmentExpression/statement/simpleAssignment.kt rename to testData/ast/assignmentExpression/statement/simpleAssignment.kt diff --git a/testData/binaryExpression/expression_mult/and.jav b/testData/ast/binaryExpression/expression_mult/and.jav similarity index 100% rename from testData/binaryExpression/expression_mult/and.jav rename to testData/ast/binaryExpression/expression_mult/and.jav diff --git a/testData/binaryExpression/expression_mult/and.kt b/testData/ast/binaryExpression/expression_mult/and.kt similarity index 100% rename from testData/binaryExpression/expression_mult/and.kt rename to testData/ast/binaryExpression/expression_mult/and.kt diff --git a/testData/binaryExpression/expression_mult/conditionalAnd.jav b/testData/ast/binaryExpression/expression_mult/conditionalAnd.jav similarity index 100% rename from testData/binaryExpression/expression_mult/conditionalAnd.jav rename to testData/ast/binaryExpression/expression_mult/conditionalAnd.jav diff --git a/testData/binaryExpression/expression_mult/conditionalAnd.kt b/testData/ast/binaryExpression/expression_mult/conditionalAnd.kt similarity index 100% rename from testData/binaryExpression/expression_mult/conditionalAnd.kt rename to testData/ast/binaryExpression/expression_mult/conditionalAnd.kt diff --git a/testData/binaryExpression/expression_mult/conditionalOr.jav b/testData/ast/binaryExpression/expression_mult/conditionalOr.jav similarity index 100% rename from testData/binaryExpression/expression_mult/conditionalOr.jav rename to testData/ast/binaryExpression/expression_mult/conditionalOr.jav diff --git a/testData/binaryExpression/expression_mult/conditionalOr.kt b/testData/ast/binaryExpression/expression_mult/conditionalOr.kt similarity index 100% rename from testData/binaryExpression/expression_mult/conditionalOr.kt rename to testData/ast/binaryExpression/expression_mult/conditionalOr.kt diff --git a/testData/binaryExpression/expression_mult/divide.jav b/testData/ast/binaryExpression/expression_mult/divide.jav similarity index 100% rename from testData/binaryExpression/expression_mult/divide.jav rename to testData/ast/binaryExpression/expression_mult/divide.jav diff --git a/testData/binaryExpression/expression_mult/divide.kt b/testData/ast/binaryExpression/expression_mult/divide.kt similarity index 100% rename from testData/binaryExpression/expression_mult/divide.kt rename to testData/ast/binaryExpression/expression_mult/divide.kt diff --git a/testData/binaryExpression/expression_mult/greaterThan.jav b/testData/ast/binaryExpression/expression_mult/greaterThan.jav similarity index 100% rename from testData/binaryExpression/expression_mult/greaterThan.jav rename to testData/ast/binaryExpression/expression_mult/greaterThan.jav diff --git a/testData/binaryExpression/expression_mult/greaterThan.kt b/testData/ast/binaryExpression/expression_mult/greaterThan.kt similarity index 100% rename from testData/binaryExpression/expression_mult/greaterThan.kt rename to testData/ast/binaryExpression/expression_mult/greaterThan.kt diff --git a/testData/binaryExpression/expression_mult/greaterThanEqual.jav b/testData/ast/binaryExpression/expression_mult/greaterThanEqual.jav similarity index 100% rename from testData/binaryExpression/expression_mult/greaterThanEqual.jav rename to testData/ast/binaryExpression/expression_mult/greaterThanEqual.jav diff --git a/testData/binaryExpression/expression_mult/greaterThanEqual.kt b/testData/ast/binaryExpression/expression_mult/greaterThanEqual.kt similarity index 100% rename from testData/binaryExpression/expression_mult/greaterThanEqual.kt rename to testData/ast/binaryExpression/expression_mult/greaterThanEqual.kt diff --git a/testData/binaryExpression/expression_mult/lessThan.jav b/testData/ast/binaryExpression/expression_mult/lessThan.jav similarity index 100% rename from testData/binaryExpression/expression_mult/lessThan.jav rename to testData/ast/binaryExpression/expression_mult/lessThan.jav diff --git a/testData/binaryExpression/expression_mult/lessThan.kt b/testData/ast/binaryExpression/expression_mult/lessThan.kt similarity index 100% rename from testData/binaryExpression/expression_mult/lessThan.kt rename to testData/ast/binaryExpression/expression_mult/lessThan.kt diff --git a/testData/binaryExpression/expression_mult/lessThanEqual.jav b/testData/ast/binaryExpression/expression_mult/lessThanEqual.jav similarity index 100% rename from testData/binaryExpression/expression_mult/lessThanEqual.jav rename to testData/ast/binaryExpression/expression_mult/lessThanEqual.jav diff --git a/testData/binaryExpression/expression_mult/lessThanEqual.kt b/testData/ast/binaryExpression/expression_mult/lessThanEqual.kt similarity index 100% rename from testData/binaryExpression/expression_mult/lessThanEqual.kt rename to testData/ast/binaryExpression/expression_mult/lessThanEqual.kt diff --git a/testData/binaryExpression/expression_mult/minus.jav b/testData/ast/binaryExpression/expression_mult/minus.jav similarity index 100% rename from testData/binaryExpression/expression_mult/minus.jav rename to testData/ast/binaryExpression/expression_mult/minus.jav diff --git a/testData/binaryExpression/expression_mult/minus.kt b/testData/ast/binaryExpression/expression_mult/minus.kt similarity index 100% rename from testData/binaryExpression/expression_mult/minus.kt rename to testData/ast/binaryExpression/expression_mult/minus.kt diff --git a/testData/binaryExpression/expression_mult/multiply.jav b/testData/ast/binaryExpression/expression_mult/multiply.jav similarity index 100% rename from testData/binaryExpression/expression_mult/multiply.jav rename to testData/ast/binaryExpression/expression_mult/multiply.jav diff --git a/testData/binaryExpression/expression_mult/multiply.kt b/testData/ast/binaryExpression/expression_mult/multiply.kt similarity index 100% rename from testData/binaryExpression/expression_mult/multiply.kt rename to testData/ast/binaryExpression/expression_mult/multiply.kt diff --git a/testData/binaryExpression/expression_mult/or.jav b/testData/ast/binaryExpression/expression_mult/or.jav similarity index 100% rename from testData/binaryExpression/expression_mult/or.jav rename to testData/ast/binaryExpression/expression_mult/or.jav diff --git a/testData/binaryExpression/expression_mult/or.kt b/testData/ast/binaryExpression/expression_mult/or.kt similarity index 100% rename from testData/binaryExpression/expression_mult/or.kt rename to testData/ast/binaryExpression/expression_mult/or.kt diff --git a/testData/binaryExpression/expression_mult/plus.jav b/testData/ast/binaryExpression/expression_mult/plus.jav similarity index 100% rename from testData/binaryExpression/expression_mult/plus.jav rename to testData/ast/binaryExpression/expression_mult/plus.jav diff --git a/testData/binaryExpression/expression_mult/plus.kt b/testData/ast/binaryExpression/expression_mult/plus.kt similarity index 100% rename from testData/binaryExpression/expression_mult/plus.kt rename to testData/ast/binaryExpression/expression_mult/plus.kt diff --git a/testData/binaryExpression/expression_mult/remainder.jav b/testData/ast/binaryExpression/expression_mult/remainder.jav similarity index 100% rename from testData/binaryExpression/expression_mult/remainder.jav rename to testData/ast/binaryExpression/expression_mult/remainder.jav diff --git a/testData/binaryExpression/expression_mult/remainder.kt b/testData/ast/binaryExpression/expression_mult/remainder.kt similarity index 100% rename from testData/binaryExpression/expression_mult/remainder.kt rename to testData/ast/binaryExpression/expression_mult/remainder.kt diff --git a/testData/binaryExpression/expression_mult/shiftLeft.jav b/testData/ast/binaryExpression/expression_mult/shiftLeft.jav similarity index 100% rename from testData/binaryExpression/expression_mult/shiftLeft.jav rename to testData/ast/binaryExpression/expression_mult/shiftLeft.jav diff --git a/testData/binaryExpression/expression_mult/shiftLeft.kt b/testData/ast/binaryExpression/expression_mult/shiftLeft.kt similarity index 100% rename from testData/binaryExpression/expression_mult/shiftLeft.kt rename to testData/ast/binaryExpression/expression_mult/shiftLeft.kt diff --git a/testData/binaryExpression/expression_mult/shiftRight.jav b/testData/ast/binaryExpression/expression_mult/shiftRight.jav similarity index 100% rename from testData/binaryExpression/expression_mult/shiftRight.jav rename to testData/ast/binaryExpression/expression_mult/shiftRight.jav diff --git a/testData/binaryExpression/expression_mult/shiftRight.kt b/testData/ast/binaryExpression/expression_mult/shiftRight.kt similarity index 100% rename from testData/binaryExpression/expression_mult/shiftRight.kt rename to testData/ast/binaryExpression/expression_mult/shiftRight.kt diff --git a/testData/binaryExpression/expression_mult/unsignedRightShift.jav b/testData/ast/binaryExpression/expression_mult/unsignedRightShift.jav similarity index 100% rename from testData/binaryExpression/expression_mult/unsignedRightShift.jav rename to testData/ast/binaryExpression/expression_mult/unsignedRightShift.jav diff --git a/testData/binaryExpression/expression_mult/unsignedRightShift.kt b/testData/ast/binaryExpression/expression_mult/unsignedRightShift.kt similarity index 100% rename from testData/binaryExpression/expression_mult/unsignedRightShift.kt rename to testData/ast/binaryExpression/expression_mult/unsignedRightShift.kt diff --git a/testData/binaryExpression/expression_mult/xor.jav b/testData/ast/binaryExpression/expression_mult/xor.jav similarity index 100% rename from testData/binaryExpression/expression_mult/xor.jav rename to testData/ast/binaryExpression/expression_mult/xor.jav diff --git a/testData/binaryExpression/expression_mult/xor.kt b/testData/ast/binaryExpression/expression_mult/xor.kt similarity index 100% rename from testData/binaryExpression/expression_mult/xor.kt rename to testData/ast/binaryExpression/expression_mult/xor.kt diff --git a/testData/boxedType/statement_mult/boolean.jav b/testData/ast/boxedType/statement_mult/boolean.jav similarity index 100% rename from testData/boxedType/statement_mult/boolean.jav rename to testData/ast/boxedType/statement_mult/boolean.jav diff --git a/testData/boxedType/statement_mult/boolean.kt b/testData/ast/boxedType/statement_mult/boolean.kt similarity index 100% rename from testData/boxedType/statement_mult/boolean.kt rename to testData/ast/boxedType/statement_mult/boolean.kt diff --git a/testData/boxedType/statement_mult/byte.jav b/testData/ast/boxedType/statement_mult/byte.jav similarity index 100% rename from testData/boxedType/statement_mult/byte.jav rename to testData/ast/boxedType/statement_mult/byte.jav diff --git a/testData/boxedType/statement_mult/byte.kt b/testData/ast/boxedType/statement_mult/byte.kt similarity index 100% rename from testData/boxedType/statement_mult/byte.kt rename to testData/ast/boxedType/statement_mult/byte.kt diff --git a/testData/boxedType/statement_mult/character.jav b/testData/ast/boxedType/statement_mult/character.jav similarity index 100% rename from testData/boxedType/statement_mult/character.jav rename to testData/ast/boxedType/statement_mult/character.jav diff --git a/testData/boxedType/statement_mult/character.kt b/testData/ast/boxedType/statement_mult/character.kt similarity index 100% rename from testData/boxedType/statement_mult/character.kt rename to testData/ast/boxedType/statement_mult/character.kt diff --git a/testData/boxedType/statement_mult/double.jav b/testData/ast/boxedType/statement_mult/double.jav similarity index 100% rename from testData/boxedType/statement_mult/double.jav rename to testData/ast/boxedType/statement_mult/double.jav diff --git a/testData/boxedType/statement_mult/double.kt b/testData/ast/boxedType/statement_mult/double.kt similarity index 100% rename from testData/boxedType/statement_mult/double.kt rename to testData/ast/boxedType/statement_mult/double.kt diff --git a/testData/boxedType/statement_mult/float.jav b/testData/ast/boxedType/statement_mult/float.jav similarity index 100% rename from testData/boxedType/statement_mult/float.jav rename to testData/ast/boxedType/statement_mult/float.jav diff --git a/testData/boxedType/statement_mult/float.kt b/testData/ast/boxedType/statement_mult/float.kt similarity index 100% rename from testData/boxedType/statement_mult/float.kt rename to testData/ast/boxedType/statement_mult/float.kt diff --git a/testData/boxedType/statement_mult/integer.jav b/testData/ast/boxedType/statement_mult/integer.jav similarity index 100% rename from testData/boxedType/statement_mult/integer.jav rename to testData/ast/boxedType/statement_mult/integer.jav diff --git a/testData/boxedType/statement_mult/integer.kt b/testData/ast/boxedType/statement_mult/integer.kt similarity index 100% rename from testData/boxedType/statement_mult/integer.kt rename to testData/ast/boxedType/statement_mult/integer.kt diff --git a/testData/boxedType/statement_mult/long.jav b/testData/ast/boxedType/statement_mult/long.jav similarity index 100% rename from testData/boxedType/statement_mult/long.jav rename to testData/ast/boxedType/statement_mult/long.jav diff --git a/testData/boxedType/statement_mult/long.kt b/testData/ast/boxedType/statement_mult/long.kt similarity index 100% rename from testData/boxedType/statement_mult/long.kt rename to testData/ast/boxedType/statement_mult/long.kt diff --git a/testData/boxedType/statement_mult/object.jav b/testData/ast/boxedType/statement_mult/object.jav similarity index 100% rename from testData/boxedType/statement_mult/object.jav rename to testData/ast/boxedType/statement_mult/object.jav diff --git a/testData/boxedType/statement_mult/object.kt b/testData/ast/boxedType/statement_mult/object.kt similarity index 100% rename from testData/boxedType/statement_mult/object.kt rename to testData/ast/boxedType/statement_mult/object.kt diff --git a/testData/boxedType/statement_mult/short.jav b/testData/ast/boxedType/statement_mult/short.jav similarity index 100% rename from testData/boxedType/statement_mult/short.jav rename to testData/ast/boxedType/statement_mult/short.jav diff --git a/testData/boxedType/statement_mult/short.kt b/testData/ast/boxedType/statement_mult/short.kt similarity index 100% rename from testData/boxedType/statement_mult/short.kt rename to testData/ast/boxedType/statement_mult/short.kt diff --git a/testData/breakStatement/statement/breakWithLabel.jav b/testData/ast/breakStatement/statement/breakWithLabel.jav similarity index 100% rename from testData/breakStatement/statement/breakWithLabel.jav rename to testData/ast/breakStatement/statement/breakWithLabel.jav diff --git a/testData/breakStatement/statement/breakWithLabel.kt b/testData/ast/breakStatement/statement/breakWithLabel.kt similarity index 100% rename from testData/breakStatement/statement/breakWithLabel.kt rename to testData/ast/breakStatement/statement/breakWithLabel.kt diff --git a/testData/breakStatement/statement/breakWithoutLabel.jav b/testData/ast/breakStatement/statement/breakWithoutLabel.jav similarity index 100% rename from testData/breakStatement/statement/breakWithoutLabel.jav rename to testData/ast/breakStatement/statement/breakWithoutLabel.jav diff --git a/testData/breakStatement/statement/breakWithoutLabel.kt b/testData/ast/breakStatement/statement/breakWithoutLabel.kt similarity index 100% rename from testData/breakStatement/statement/breakWithoutLabel.kt rename to testData/ast/breakStatement/statement/breakWithoutLabel.kt diff --git a/testData/class_/class/class.jav b/testData/ast/class_/class/class.jav similarity index 100% rename from testData/class_/class/class.jav rename to testData/ast/class_/class/class.jav diff --git a/testData/class_/class/class.kt b/testData/ast/class_/class/class.kt similarity index 100% rename from testData/class_/class/class.kt rename to testData/ast/class_/class/class.kt diff --git a/testData/class_/class/emptyClass.jav b/testData/ast/class_/class/emptyClass.jav similarity index 100% rename from testData/class_/class/emptyClass.jav rename to testData/ast/class_/class/emptyClass.jav diff --git a/testData/class_/class/emptyClass.kt b/testData/ast/class_/class/emptyClass.kt similarity index 100% rename from testData/class_/class/emptyClass.kt rename to testData/ast/class_/class/emptyClass.kt diff --git a/testData/class_/class/extendsOneClassAndImplementsOneInterface.jav b/testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.jav similarity index 100% rename from testData/class_/class/extendsOneClassAndImplementsOneInterface.jav rename to testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.jav diff --git a/testData/class_/class/extendsOneClassAndImplementsOneInterface.kt b/testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.kt similarity index 100% rename from testData/class_/class/extendsOneClassAndImplementsOneInterface.kt rename to testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.kt diff --git a/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav similarity index 100% rename from testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav rename to testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav diff --git a/testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt similarity index 100% rename from testData/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt rename to testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt diff --git a/testData/class_/class/finalClass.jav b/testData/ast/class_/class/finalClass.jav similarity index 100% rename from testData/class_/class/finalClass.jav rename to testData/ast/class_/class/finalClass.jav diff --git a/testData/class_/class/finalClass.kt b/testData/ast/class_/class/finalClass.kt similarity index 100% rename from testData/class_/class/finalClass.kt rename to testData/ast/class_/class/finalClass.kt diff --git a/testData/class_/class/genericClass.jav b/testData/ast/class_/class/genericClass.jav similarity index 100% rename from testData/class_/class/genericClass.jav rename to testData/ast/class_/class/genericClass.jav diff --git a/testData/class_/class/genericClass.kt b/testData/ast/class_/class/genericClass.kt similarity index 100% rename from testData/class_/class/genericClass.kt rename to testData/ast/class_/class/genericClass.kt diff --git a/testData/class_/class/innerEmptyClass.jav b/testData/ast/class_/class/innerEmptyClass.jav similarity index 100% rename from testData/class_/class/innerEmptyClass.jav rename to testData/ast/class_/class/innerEmptyClass.jav diff --git a/testData/class_/class/innerEmptyClass.kt b/testData/ast/class_/class/innerEmptyClass.kt similarity index 100% rename from testData/class_/class/innerEmptyClass.kt rename to testData/ast/class_/class/innerEmptyClass.kt diff --git a/testData/class_/class/innerStaticClass.jav b/testData/ast/class_/class/innerStaticClass.jav similarity index 100% rename from testData/class_/class/innerStaticClass.jav rename to testData/ast/class_/class/innerStaticClass.jav diff --git a/testData/class_/class/innerStaticClass.kt b/testData/ast/class_/class/innerStaticClass.kt similarity index 100% rename from testData/class_/class/innerStaticClass.kt rename to testData/ast/class_/class/innerStaticClass.kt diff --git a/testData/class_/class/internalClass.jav b/testData/ast/class_/class/internalClass.jav similarity index 100% rename from testData/class_/class/internalClass.jav rename to testData/ast/class_/class/internalClass.jav diff --git a/testData/class_/class/internalClass.kt b/testData/ast/class_/class/internalClass.kt similarity index 100% rename from testData/class_/class/internalClass.kt rename to testData/ast/class_/class/internalClass.kt diff --git a/testData/class_/class/oneStaticFieldOneNonStatic.jav b/testData/ast/class_/class/oneStaticFieldOneNonStatic.jav similarity index 100% rename from testData/class_/class/oneStaticFieldOneNonStatic.jav rename to testData/ast/class_/class/oneStaticFieldOneNonStatic.jav diff --git a/testData/class_/class/oneStaticFieldOneNonStatic.kt b/testData/ast/class_/class/oneStaticFieldOneNonStatic.kt similarity index 100% rename from testData/class_/class/oneStaticFieldOneNonStatic.kt rename to testData/ast/class_/class/oneStaticFieldOneNonStatic.kt diff --git a/testData/class_/class/oneStaticMethod.jav b/testData/ast/class_/class/oneStaticMethod.jav similarity index 100% rename from testData/class_/class/oneStaticMethod.jav rename to testData/ast/class_/class/oneStaticMethod.jav diff --git a/testData/class_/class/oneStaticMethod.kt b/testData/ast/class_/class/oneStaticMethod.kt similarity index 100% rename from testData/class_/class/oneStaticMethod.kt rename to testData/ast/class_/class/oneStaticMethod.kt diff --git a/testData/class_/class/oneStaticMethodOneNonStatic.jav b/testData/ast/class_/class/oneStaticMethodOneNonStatic.jav similarity index 100% rename from testData/class_/class/oneStaticMethodOneNonStatic.jav rename to testData/ast/class_/class/oneStaticMethodOneNonStatic.jav diff --git a/testData/class_/class/oneStaticMethodOneNonStatic.kt b/testData/ast/class_/class/oneStaticMethodOneNonStatic.kt similarity index 100% rename from testData/class_/class/oneStaticMethodOneNonStatic.kt rename to testData/ast/class_/class/oneStaticMethodOneNonStatic.kt diff --git a/testData/class_/class/pivateClass.jav b/testData/ast/class_/class/pivateClass.jav similarity index 100% rename from testData/class_/class/pivateClass.jav rename to testData/ast/class_/class/pivateClass.jav diff --git a/testData/class_/class/pivateClass.kt b/testData/ast/class_/class/pivateClass.kt similarity index 100% rename from testData/class_/class/pivateClass.kt rename to testData/ast/class_/class/pivateClass.kt diff --git a/testData/class_/class/protectedClass.jav b/testData/ast/class_/class/protectedClass.jav similarity index 100% rename from testData/class_/class/protectedClass.jav rename to testData/ast/class_/class/protectedClass.jav diff --git a/testData/class_/class/protectedClass.kt b/testData/ast/class_/class/protectedClass.kt similarity index 100% rename from testData/class_/class/protectedClass.kt rename to testData/ast/class_/class/protectedClass.kt diff --git a/testData/class_/class/publicClass.jav b/testData/ast/class_/class/publicClass.jav similarity index 100% rename from testData/class_/class/publicClass.jav rename to testData/ast/class_/class/publicClass.jav diff --git a/testData/class_/class/publicClass.kt b/testData/ast/class_/class/publicClass.kt similarity index 100% rename from testData/class_/class/publicClass.kt rename to testData/ast/class_/class/publicClass.kt diff --git a/testData/class_/class/simpleInheritance.jav b/testData/ast/class_/class/simpleInheritance.jav similarity index 100% rename from testData/class_/class/simpleInheritance.jav rename to testData/ast/class_/class/simpleInheritance.jav diff --git a/testData/class_/class/simpleInheritance.kt b/testData/ast/class_/class/simpleInheritance.kt similarity index 100% rename from testData/class_/class/simpleInheritance.kt rename to testData/ast/class_/class/simpleInheritance.kt diff --git a/testData/class_/class/twoStaticMethod.jav b/testData/ast/class_/class/twoStaticMethod.jav similarity index 100% rename from testData/class_/class/twoStaticMethod.jav rename to testData/ast/class_/class/twoStaticMethod.jav diff --git a/testData/class_/class/twoStaticMethod.kt b/testData/ast/class_/class/twoStaticMethod.kt similarity index 100% rename from testData/class_/class/twoStaticMethod.kt rename to testData/ast/class_/class/twoStaticMethod.kt diff --git a/testData/class_/class_mult/classWithEmptyMethods.jav b/testData/ast/class_/class_mult/classWithEmptyMethods.jav similarity index 100% rename from testData/class_/class_mult/classWithEmptyMethods.jav rename to testData/ast/class_/class_mult/classWithEmptyMethods.jav diff --git a/testData/class_/class_mult/classWithEmptyMethods.kt b/testData/ast/class_/class_mult/classWithEmptyMethods.kt similarity index 100% rename from testData/class_/class_mult/classWithEmptyMethods.kt rename to testData/ast/class_/class_mult/classWithEmptyMethods.kt diff --git a/testData/class_/class_mult/classWithFields.jav b/testData/ast/class_/class_mult/classWithFields.jav similarity index 100% rename from testData/class_/class_mult/classWithFields.jav rename to testData/ast/class_/class_mult/classWithFields.jav diff --git a/testData/class_/class_mult/classWithFields.kt b/testData/ast/class_/class_mult/classWithFields.kt similarity index 100% rename from testData/class_/class_mult/classWithFields.kt rename to testData/ast/class_/class_mult/classWithFields.kt diff --git a/testData/class_/class_mult/classWithMultiplyFields.jav b/testData/ast/class_/class_mult/classWithMultiplyFields.jav similarity index 100% rename from testData/class_/class_mult/classWithMultiplyFields.jav rename to testData/ast/class_/class_mult/classWithMultiplyFields.jav diff --git a/testData/class_/class_mult/classWithMultiplyFields.kt b/testData/ast/class_/class_mult/classWithMultiplyFields.kt similarity index 100% rename from testData/class_/class_mult/classWithMultiplyFields.kt rename to testData/ast/class_/class_mult/classWithMultiplyFields.kt diff --git a/testData/conditionalExpression/expression_mult/simpleConditionalExpression.jav b/testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.jav similarity index 100% rename from testData/conditionalExpression/expression_mult/simpleConditionalExpression.jav rename to testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.jav diff --git a/testData/conditionalExpression/expression_mult/simpleConditionalExpression.kt b/testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.kt similarity index 100% rename from testData/conditionalExpression/expression_mult/simpleConditionalExpression.kt rename to testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.kt diff --git a/testData/continueStatement/statement/continueWithLabel.jav b/testData/ast/continueStatement/statement/continueWithLabel.jav similarity index 100% rename from testData/continueStatement/statement/continueWithLabel.jav rename to testData/ast/continueStatement/statement/continueWithLabel.jav diff --git a/testData/continueStatement/statement/continueWithLabel.kt b/testData/ast/continueStatement/statement/continueWithLabel.kt similarity index 100% rename from testData/continueStatement/statement/continueWithLabel.kt rename to testData/ast/continueStatement/statement/continueWithLabel.kt diff --git a/testData/continueStatement/statement/continueWithoutLabel.jav b/testData/ast/continueStatement/statement/continueWithoutLabel.jav similarity index 100% rename from testData/continueStatement/statement/continueWithoutLabel.jav rename to testData/ast/continueStatement/statement/continueWithoutLabel.jav diff --git a/testData/continueStatement/statement/continueWithoutLabel.kt b/testData/ast/continueStatement/statement/continueWithoutLabel.kt similarity index 100% rename from testData/continueStatement/statement/continueWithoutLabel.kt rename to testData/ast/continueStatement/statement/continueWithoutLabel.kt diff --git a/testData/declarationStatement/statement/singleFinalIntDeclaration.jav b/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav similarity index 100% rename from testData/declarationStatement/statement/singleFinalIntDeclaration.jav rename to testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav diff --git a/testData/declarationStatement/statement/singleFinalIntDeclaration.kt b/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt similarity index 100% rename from testData/declarationStatement/statement/singleFinalIntDeclaration.kt rename to testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt diff --git a/testData/declarationStatement/statement/singleFinalStringDeclaration.jav b/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav similarity index 100% rename from testData/declarationStatement/statement/singleFinalStringDeclaration.jav rename to testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav diff --git a/testData/declarationStatement/statement/singleFinalStringDeclaration.kt b/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt similarity index 100% rename from testData/declarationStatement/statement/singleFinalStringDeclaration.kt rename to testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt diff --git a/testData/declarationStatement/statement/singleIntDeclaration.jav b/testData/ast/declarationStatement/statement/singleIntDeclaration.jav similarity index 100% rename from testData/declarationStatement/statement/singleIntDeclaration.jav rename to testData/ast/declarationStatement/statement/singleIntDeclaration.jav diff --git a/testData/declarationStatement/statement/singleIntDeclaration.kt b/testData/ast/declarationStatement/statement/singleIntDeclaration.kt similarity index 100% rename from testData/declarationStatement/statement/singleIntDeclaration.kt rename to testData/ast/declarationStatement/statement/singleIntDeclaration.kt diff --git a/testData/declarationStatement/statement/singleStringDeclaration.jav b/testData/ast/declarationStatement/statement/singleStringDeclaration.jav similarity index 100% rename from testData/declarationStatement/statement/singleStringDeclaration.jav rename to testData/ast/declarationStatement/statement/singleStringDeclaration.jav diff --git a/testData/declarationStatement/statement/singleStringDeclaration.kt b/testData/ast/declarationStatement/statement/singleStringDeclaration.kt similarity index 100% rename from testData/declarationStatement/statement/singleStringDeclaration.kt rename to testData/ast/declarationStatement/statement/singleStringDeclaration.kt diff --git a/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav b/testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav similarity index 100% rename from testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav rename to testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav diff --git a/testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt b/testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt similarity index 100% rename from testData/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt rename to testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt diff --git a/testData/declarationStatement/statement_mult/multiplyIntDeclaration.jav b/testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.jav similarity index 100% rename from testData/declarationStatement/statement_mult/multiplyIntDeclaration.jav rename to testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.jav diff --git a/testData/declarationStatement/statement_mult/multiplyIntDeclaration.kt b/testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.kt similarity index 100% rename from testData/declarationStatement/statement_mult/multiplyIntDeclaration.kt rename to testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.kt diff --git a/testData/doWhileStatement/statement_mult/whileWithBlock.jav b/testData/ast/doWhileStatement/statement_mult/whileWithBlock.jav similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithBlock.jav rename to testData/ast/doWhileStatement/statement_mult/whileWithBlock.jav diff --git a/testData/doWhileStatement/statement_mult/whileWithBlock.kt b/testData/ast/doWhileStatement/statement_mult/whileWithBlock.kt similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithBlock.kt rename to testData/ast/doWhileStatement/statement_mult/whileWithBlock.kt diff --git a/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.jav b/testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.jav similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithEmptyBlock.jav rename to testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.jav diff --git a/testData/doWhileStatement/statement_mult/whileWithEmptyBlock.kt b/testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.kt similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithEmptyBlock.kt rename to testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.kt diff --git a/testData/doWhileStatement/statement_mult/whileWithExpression.jav b/testData/ast/doWhileStatement/statement_mult/whileWithExpression.jav similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithExpression.jav rename to testData/ast/doWhileStatement/statement_mult/whileWithExpression.jav diff --git a/testData/doWhileStatement/statement_mult/whileWithExpression.kt b/testData/ast/doWhileStatement/statement_mult/whileWithExpression.kt similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithExpression.kt rename to testData/ast/doWhileStatement/statement_mult/whileWithExpression.kt diff --git a/testData/doWhileStatement/statement_mult/whileWithReturn.jav b/testData/ast/doWhileStatement/statement_mult/whileWithReturn.jav similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithReturn.jav rename to testData/ast/doWhileStatement/statement_mult/whileWithReturn.jav diff --git a/testData/doWhileStatement/statement_mult/whileWithReturn.kt b/testData/ast/doWhileStatement/statement_mult/whileWithReturn.kt similarity index 100% rename from testData/doWhileStatement/statement_mult/whileWithReturn.kt rename to testData/ast/doWhileStatement/statement_mult/whileWithReturn.kt diff --git a/testData/enum/class/emptyEnum.jav b/testData/ast/enum/class/emptyEnum.jav similarity index 100% rename from testData/enum/class/emptyEnum.jav rename to testData/ast/enum/class/emptyEnum.jav diff --git a/testData/enum/class/emptyEnum.kt b/testData/ast/enum/class/emptyEnum.kt similarity index 100% rename from testData/enum/class/emptyEnum.kt rename to testData/ast/enum/class/emptyEnum.kt diff --git a/testData/enum/class/enumImplementsOneInterface.jav b/testData/ast/enum/class/enumImplementsOneInterface.jav similarity index 100% rename from testData/enum/class/enumImplementsOneInterface.jav rename to testData/ast/enum/class/enumImplementsOneInterface.jav diff --git a/testData/enum/class/enumImplementsOneInterface.kt b/testData/ast/enum/class/enumImplementsOneInterface.kt similarity index 100% rename from testData/enum/class/enumImplementsOneInterface.kt rename to testData/ast/enum/class/enumImplementsOneInterface.kt diff --git a/testData/enum/class/enumImplementsSeveralInterfaces.jav b/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav similarity index 100% rename from testData/enum/class/enumImplementsSeveralInterfaces.jav rename to testData/ast/enum/class/enumImplementsSeveralInterfaces.jav diff --git a/testData/enum/class/enumImplementsSeveralInterfaces.kt b/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt similarity index 100% rename from testData/enum/class/enumImplementsSeveralInterfaces.kt rename to testData/ast/enum/class/enumImplementsSeveralInterfaces.kt diff --git a/testData/enum/class/internalEnum.jav b/testData/ast/enum/class/internalEnum.jav similarity index 100% rename from testData/enum/class/internalEnum.jav rename to testData/ast/enum/class/internalEnum.jav diff --git a/testData/enum/class/internalEnum.kt b/testData/ast/enum/class/internalEnum.kt similarity index 100% rename from testData/enum/class/internalEnum.kt rename to testData/ast/enum/class/internalEnum.kt diff --git a/testData/enum/class/privateEnum.jav b/testData/ast/enum/class/privateEnum.jav similarity index 100% rename from testData/enum/class/privateEnum.jav rename to testData/ast/enum/class/privateEnum.jav diff --git a/testData/enum/class/privateEnum.kt b/testData/ast/enum/class/privateEnum.kt similarity index 100% rename from testData/enum/class/privateEnum.kt rename to testData/ast/enum/class/privateEnum.kt diff --git a/testData/enum/class/protectedEnum.jav b/testData/ast/enum/class/protectedEnum.jav similarity index 100% rename from testData/enum/class/protectedEnum.jav rename to testData/ast/enum/class/protectedEnum.jav diff --git a/testData/enum/class/protectedEnum.kt b/testData/ast/enum/class/protectedEnum.kt similarity index 100% rename from testData/enum/class/protectedEnum.kt rename to testData/ast/enum/class/protectedEnum.kt diff --git a/testData/enum/class/publicEnum.jav b/testData/ast/enum/class/publicEnum.jav similarity index 100% rename from testData/enum/class/publicEnum.jav rename to testData/ast/enum/class/publicEnum.jav diff --git a/testData/enum/class/publicEnum.kt b/testData/ast/enum/class/publicEnum.kt similarity index 100% rename from testData/enum/class/publicEnum.kt rename to testData/ast/enum/class/publicEnum.kt diff --git a/testData/enum/class_mult/enumWithNameField.jav b/testData/ast/enum/class_mult/enumWithNameField.jav similarity index 100% rename from testData/enum/class_mult/enumWithNameField.jav rename to testData/ast/enum/class_mult/enumWithNameField.jav diff --git a/testData/enum/class_mult/enumWithNameField.kt b/testData/ast/enum/class_mult/enumWithNameField.kt similarity index 100% rename from testData/enum/class_mult/enumWithNameField.kt rename to testData/ast/enum/class_mult/enumWithNameField.kt diff --git a/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav b/testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav similarity index 100% rename from testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav rename to testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.jav diff --git a/testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt b/testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt similarity index 100% rename from testData/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt rename to testData/ast/enum/class_mult/fieldsWithPrimaryPrivateConstructor.kt diff --git a/testData/enum/class_mult/overrideToString.jav b/testData/ast/enum/class_mult/overrideToString.jav similarity index 100% rename from testData/enum/class_mult/overrideToString.jav rename to testData/ast/enum/class_mult/overrideToString.jav diff --git a/testData/enum/class_mult/overrideToString.kt b/testData/ast/enum/class_mult/overrideToString.kt similarity index 100% rename from testData/enum/class_mult/overrideToString.kt rename to testData/ast/enum/class_mult/overrideToString.kt diff --git a/testData/enum/class_mult/runnableImplementation.jav b/testData/ast/enum/class_mult/runnableImplementation.jav similarity index 100% rename from testData/enum/class_mult/runnableImplementation.jav rename to testData/ast/enum/class_mult/runnableImplementation.jav diff --git a/testData/enum/class_mult/runnableImplementation.kt b/testData/ast/enum/class_mult/runnableImplementation.kt similarity index 100% rename from testData/enum/class_mult/runnableImplementation.kt rename to testData/ast/enum/class_mult/runnableImplementation.kt diff --git a/testData/enum/class_mult/typeSafeEnum.jav b/testData/ast/enum/class_mult/typeSafeEnum.jav similarity index 100% rename from testData/enum/class_mult/typeSafeEnum.jav rename to testData/ast/enum/class_mult/typeSafeEnum.jav diff --git a/testData/enum/class_mult/typeSafeEnum.kt b/testData/ast/enum/class_mult/typeSafeEnum.kt similarity index 100% rename from testData/enum/class_mult/typeSafeEnum.kt rename to testData/ast/enum/class_mult/typeSafeEnum.kt diff --git a/testData/field/method/internalField.jav b/testData/ast/field/method/internalField.jav similarity index 100% rename from testData/field/method/internalField.jav rename to testData/ast/field/method/internalField.jav diff --git a/testData/field/method/internalField.kt b/testData/ast/field/method/internalField.kt similarity index 100% rename from testData/field/method/internalField.kt rename to testData/ast/field/method/internalField.kt diff --git a/testData/field/method/privateField.jav b/testData/ast/field/method/privateField.jav similarity index 100% rename from testData/field/method/privateField.jav rename to testData/ast/field/method/privateField.jav diff --git a/testData/field/method/privateField.kt b/testData/ast/field/method/privateField.kt similarity index 100% rename from testData/field/method/privateField.kt rename to testData/ast/field/method/privateField.kt diff --git a/testData/field/method/protectedField.jav b/testData/ast/field/method/protectedField.jav similarity index 100% rename from testData/field/method/protectedField.jav rename to testData/ast/field/method/protectedField.jav diff --git a/testData/field/method/protectedField.kt b/testData/ast/field/method/protectedField.kt similarity index 100% rename from testData/field/method/protectedField.kt rename to testData/ast/field/method/protectedField.kt diff --git a/testData/field/method/publicField.jav b/testData/ast/field/method/publicField.jav similarity index 100% rename from testData/field/method/publicField.jav rename to testData/ast/field/method/publicField.jav diff --git a/testData/field/method/publicField.kt b/testData/ast/field/method/publicField.kt similarity index 100% rename from testData/field/method/publicField.kt rename to testData/ast/field/method/publicField.kt diff --git a/testData/field/method/valWithInit.jav b/testData/ast/field/method/valWithInit.jav similarity index 100% rename from testData/field/method/valWithInit.jav rename to testData/ast/field/method/valWithInit.jav diff --git a/testData/field/method/valWithInit.kt b/testData/ast/field/method/valWithInit.kt similarity index 100% rename from testData/field/method/valWithInit.kt rename to testData/ast/field/method/valWithInit.kt diff --git a/testData/field/method/varWithInit.jav b/testData/ast/field/method/varWithInit.jav similarity index 100% rename from testData/field/method/varWithInit.jav rename to testData/ast/field/method/varWithInit.jav diff --git a/testData/field/method/varWithInit.kt b/testData/ast/field/method/varWithInit.kt similarity index 100% rename from testData/field/method/varWithInit.kt rename to testData/ast/field/method/varWithInit.kt diff --git a/testData/field/method/varWithoutInit.jav b/testData/ast/field/method/varWithoutInit.jav similarity index 100% rename from testData/field/method/varWithoutInit.jav rename to testData/ast/field/method/varWithoutInit.jav diff --git a/testData/field/method/varWithoutInit.kt b/testData/ast/field/method/varWithoutInit.kt similarity index 100% rename from testData/field/method/varWithoutInit.kt rename to testData/ast/field/method/varWithoutInit.kt diff --git a/testData/file_/file/packageWithClass.jav b/testData/ast/file_/file/packageWithClass.jav similarity index 100% rename from testData/file_/file/packageWithClass.jav rename to testData/ast/file_/file/packageWithClass.jav diff --git a/testData/file_/file/packageWithClass.kt b/testData/ast/file_/file/packageWithClass.kt similarity index 100% rename from testData/file_/file/packageWithClass.kt rename to testData/ast/file_/file/packageWithClass.kt diff --git a/testData/file_/file/packageWithClasses.jav b/testData/ast/file_/file/packageWithClasses.jav similarity index 100% rename from testData/file_/file/packageWithClasses.jav rename to testData/ast/file_/file/packageWithClasses.jav diff --git a/testData/file_/file/packageWithClasses.kt b/testData/ast/file_/file/packageWithClasses.kt similarity index 100% rename from testData/file_/file/packageWithClasses.kt rename to testData/ast/file_/file/packageWithClasses.kt diff --git a/testData/file_/file/packageWithOpenClass.jav b/testData/ast/file_/file/packageWithOpenClass.jav similarity index 100% rename from testData/file_/file/packageWithOpenClass.jav rename to testData/ast/file_/file/packageWithOpenClass.jav diff --git a/testData/file_/file/packageWithOpenClass.kt b/testData/ast/file_/file/packageWithOpenClass.kt similarity index 100% rename from testData/file_/file/packageWithOpenClass.kt rename to testData/ast/file_/file/packageWithOpenClass.kt diff --git a/testData/file_/file_mult/packageWithImports.jav b/testData/ast/file_/file_mult/packageWithImports.jav similarity index 100% rename from testData/file_/file_mult/packageWithImports.jav rename to testData/ast/file_/file_mult/packageWithImports.jav diff --git a/testData/file_/file_mult/packageWithImports.kt b/testData/ast/file_/file_mult/packageWithImports.kt similarity index 100% rename from testData/file_/file_mult/packageWithImports.kt rename to testData/ast/file_/file_mult/packageWithImports.kt diff --git a/testData/file_/file_mult/packageWithMixedImports.jav b/testData/ast/file_/file_mult/packageWithMixedImports.jav similarity index 100% rename from testData/file_/file_mult/packageWithMixedImports.jav rename to testData/ast/file_/file_mult/packageWithMixedImports.jav diff --git a/testData/file_/file_mult/packageWithMixedImports.kt b/testData/ast/file_/file_mult/packageWithMixedImports.kt similarity index 100% rename from testData/file_/file_mult/packageWithMixedImports.kt rename to testData/ast/file_/file_mult/packageWithMixedImports.kt diff --git a/testData/file_/file_mult/packageWithStaticImports.jav b/testData/ast/file_/file_mult/packageWithStaticImports.jav similarity index 100% rename from testData/file_/file_mult/packageWithStaticImports.jav rename to testData/ast/file_/file_mult/packageWithStaticImports.jav diff --git a/testData/file_/file_mult/packageWithStaticImports.kt b/testData/ast/file_/file_mult/packageWithStaticImports.kt similarity index 100% rename from testData/file_/file_mult/packageWithStaticImports.kt rename to testData/ast/file_/file_mult/packageWithStaticImports.kt diff --git a/testData/for/statement_mult/commonCaseForTest.jav b/testData/ast/for/statement_mult/commonCaseForTest.jav similarity index 100% rename from testData/for/statement_mult/commonCaseForTest.jav rename to testData/ast/for/statement_mult/commonCaseForTest.jav diff --git a/testData/for/statement_mult/commonCaseForTest.kt b/testData/ast/for/statement_mult/commonCaseForTest.kt similarity index 100% rename from testData/for/statement_mult/commonCaseForTest.kt rename to testData/ast/for/statement_mult/commonCaseForTest.kt diff --git a/testData/for/statement_mult/forWithBlock.jav b/testData/ast/for/statement_mult/forWithBlock.jav similarity index 100% rename from testData/for/statement_mult/forWithBlock.jav rename to testData/ast/for/statement_mult/forWithBlock.jav diff --git a/testData/for/statement_mult/forWithBlock.kt b/testData/ast/for/statement_mult/forWithBlock.kt similarity index 100% rename from testData/for/statement_mult/forWithBlock.kt rename to testData/ast/for/statement_mult/forWithBlock.kt diff --git a/testData/for/statement_mult/forWithBlockAndDoubleUpdate.jav b/testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.jav similarity index 100% rename from testData/for/statement_mult/forWithBlockAndDoubleUpdate.jav rename to testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.jav diff --git a/testData/for/statement_mult/forWithBlockAndDoubleUpdate.kt b/testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.kt similarity index 100% rename from testData/for/statement_mult/forWithBlockAndDoubleUpdate.kt rename to testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.kt diff --git a/testData/for/statement_mult/forWithEmptyBlock.jav b/testData/ast/for/statement_mult/forWithEmptyBlock.jav similarity index 100% rename from testData/for/statement_mult/forWithEmptyBlock.jav rename to testData/ast/for/statement_mult/forWithEmptyBlock.jav diff --git a/testData/for/statement_mult/forWithEmptyBlock.kt b/testData/ast/for/statement_mult/forWithEmptyBlock.kt similarity index 100% rename from testData/for/statement_mult/forWithEmptyBlock.kt rename to testData/ast/for/statement_mult/forWithEmptyBlock.kt diff --git a/testData/for/statement_mult/forWithExpression.jav b/testData/ast/for/statement_mult/forWithExpression.jav similarity index 100% rename from testData/for/statement_mult/forWithExpression.jav rename to testData/ast/for/statement_mult/forWithExpression.jav diff --git a/testData/for/statement_mult/forWithExpression.kt b/testData/ast/for/statement_mult/forWithExpression.kt similarity index 100% rename from testData/for/statement_mult/forWithExpression.kt rename to testData/ast/for/statement_mult/forWithExpression.kt diff --git a/testData/for/statement_mult/forWithReturn.jav b/testData/ast/for/statement_mult/forWithReturn.jav similarity index 100% rename from testData/for/statement_mult/forWithReturn.jav rename to testData/ast/for/statement_mult/forWithReturn.jav diff --git a/testData/for/statement_mult/forWithReturn.kt b/testData/ast/for/statement_mult/forWithReturn.kt similarity index 100% rename from testData/for/statement_mult/forWithReturn.kt rename to testData/ast/for/statement_mult/forWithReturn.kt diff --git a/testData/foreachStatement/statement_mult/enhancedForWithBlock.jav b/testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.jav similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithBlock.jav rename to testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.jav diff --git a/testData/foreachStatement/statement_mult/enhancedForWithBlock.kt b/testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.kt similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithBlock.kt rename to testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.kt diff --git a/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav b/testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav rename to testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav diff --git a/testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt b/testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt rename to testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt diff --git a/testData/foreachStatement/statement_mult/enhancedForWithExpression.jav b/testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.jav similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithExpression.jav rename to testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.jav diff --git a/testData/foreachStatement/statement_mult/enhancedForWithExpression.kt b/testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.kt similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithExpression.kt rename to testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.kt diff --git a/testData/foreachStatement/statement_mult/enhancedForWithReturn.jav b/testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.jav similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithReturn.jav rename to testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.jav diff --git a/testData/foreachStatement/statement_mult/enhancedForWithReturn.kt b/testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.kt similarity index 100% rename from testData/foreachStatement/statement_mult/enhancedForWithReturn.kt rename to testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.kt diff --git a/testData/function/file/override.jav b/testData/ast/function/file/override.jav similarity index 100% rename from testData/function/file/override.jav rename to testData/ast/function/file/override.jav diff --git a/testData/function/file/override.kt b/testData/ast/function/file/override.kt similarity index 100% rename from testData/function/file/override.kt rename to testData/ast/function/file/override.kt diff --git a/testData/function/method/classGenericParam.jav b/testData/ast/function/method/classGenericParam.jav similarity index 100% rename from testData/function/method/classGenericParam.jav rename to testData/ast/function/method/classGenericParam.jav diff --git a/testData/function/method/classGenericParam.kt b/testData/ast/function/method/classGenericParam.kt similarity index 100% rename from testData/function/method/classGenericParam.kt rename to testData/ast/function/method/classGenericParam.kt diff --git a/testData/function/method/emptyVoidMethod.jav b/testData/ast/function/method/emptyVoidMethod.jav similarity index 100% rename from testData/function/method/emptyVoidMethod.jav rename to testData/ast/function/method/emptyVoidMethod.jav diff --git a/testData/function/method/emptyVoidMethod.kt b/testData/ast/function/method/emptyVoidMethod.kt similarity index 100% rename from testData/function/method/emptyVoidMethod.kt rename to testData/ast/function/method/emptyVoidMethod.kt diff --git a/testData/function/method/internal.jav b/testData/ast/function/method/internal.jav similarity index 100% rename from testData/function/method/internal.jav rename to testData/ast/function/method/internal.jav diff --git a/testData/function/method/internal.kt b/testData/ast/function/method/internal.kt similarity index 100% rename from testData/function/method/internal.kt rename to testData/ast/function/method/internal.kt diff --git a/testData/function/method/methodClassType.jav b/testData/ast/function/method/methodClassType.jav similarity index 100% rename from testData/function/method/methodClassType.jav rename to testData/ast/function/method/methodClassType.jav diff --git a/testData/function/method/methodClassType.kt b/testData/ast/function/method/methodClassType.kt similarity index 100% rename from testData/function/method/methodClassType.kt rename to testData/ast/function/method/methodClassType.kt diff --git a/testData/function/method/methodPrimitiveType.jav b/testData/ast/function/method/methodPrimitiveType.jav similarity index 100% rename from testData/function/method/methodPrimitiveType.jav rename to testData/ast/function/method/methodPrimitiveType.jav diff --git a/testData/function/method/methodPrimitiveType.kt b/testData/ast/function/method/methodPrimitiveType.kt similarity index 100% rename from testData/function/method/methodPrimitiveType.kt rename to testData/ast/function/method/methodPrimitiveType.kt diff --git a/testData/function/method/methodPrimitiveType2.jav b/testData/ast/function/method/methodPrimitiveType2.jav similarity index 100% rename from testData/function/method/methodPrimitiveType2.jav rename to testData/ast/function/method/methodPrimitiveType2.jav diff --git a/testData/function/method/methodPrimitiveType2.kt b/testData/ast/function/method/methodPrimitiveType2.kt similarity index 100% rename from testData/function/method/methodPrimitiveType2.kt rename to testData/ast/function/method/methodPrimitiveType2.kt diff --git a/testData/function/method/methodWithReturnStatement.jav b/testData/ast/function/method/methodWithReturnStatement.jav similarity index 100% rename from testData/function/method/methodWithReturnStatement.jav rename to testData/ast/function/method/methodWithReturnStatement.jav diff --git a/testData/function/method/methodWithReturnStatement.kt b/testData/ast/function/method/methodWithReturnStatement.kt similarity index 100% rename from testData/function/method/methodWithReturnStatement.kt rename to testData/ast/function/method/methodWithReturnStatement.kt diff --git a/testData/function/method/ownGenericParam.jav b/testData/ast/function/method/ownGenericParam.jav similarity index 100% rename from testData/function/method/ownGenericParam.jav rename to testData/ast/function/method/ownGenericParam.jav diff --git a/testData/function/method/ownGenericParam.kt b/testData/ast/function/method/ownGenericParam.kt similarity index 100% rename from testData/function/method/ownGenericParam.kt rename to testData/ast/function/method/ownGenericParam.kt diff --git a/testData/function/method/ownSeveralGenericParams.jav b/testData/ast/function/method/ownSeveralGenericParams.jav similarity index 100% rename from testData/function/method/ownSeveralGenericParams.jav rename to testData/ast/function/method/ownSeveralGenericParams.jav diff --git a/testData/function/method/ownSeveralGenericParams.kt b/testData/ast/function/method/ownSeveralGenericParams.kt similarity index 100% rename from testData/function/method/ownSeveralGenericParams.kt rename to testData/ast/function/method/ownSeveralGenericParams.kt diff --git a/testData/function/method/private.jav b/testData/ast/function/method/private.jav similarity index 100% rename from testData/function/method/private.jav rename to testData/ast/function/method/private.jav diff --git a/testData/function/method/private.kt b/testData/ast/function/method/private.kt similarity index 100% rename from testData/function/method/private.kt rename to testData/ast/function/method/private.kt diff --git a/testData/function/method/protected.jav b/testData/ast/function/method/protected.jav similarity index 100% rename from testData/function/method/protected.jav rename to testData/ast/function/method/protected.jav diff --git a/testData/function/method/protected.kt b/testData/ast/function/method/protected.kt similarity index 100% rename from testData/function/method/protected.kt rename to testData/ast/function/method/protected.kt diff --git a/testData/function/method/public.jav b/testData/ast/function/method/public.jav similarity index 100% rename from testData/function/method/public.jav rename to testData/ast/function/method/public.jav diff --git a/testData/function/method/public.kt b/testData/ast/function/method/public.kt similarity index 100% rename from testData/function/method/public.kt rename to testData/ast/function/method/public.kt diff --git a/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav b/testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav rename to testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav diff --git a/testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt b/testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt rename to testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt diff --git a/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav b/testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav rename to testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav diff --git a/testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt b/testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt rename to testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt diff --git a/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav b/testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav rename to testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav diff --git a/testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt b/testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt rename to testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt diff --git a/testData/ifStatement/statement_mult/ifStatementWithoutElse.jav b/testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.jav similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithoutElse.jav rename to testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.jav diff --git a/testData/ifStatement/statement_mult/ifStatementWithoutElse.kt b/testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.kt similarity index 100% rename from testData/ifStatement/statement_mult/ifStatementWithoutElse.kt rename to testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.kt diff --git a/testData/inProjectionType/method/methodParams.jav b/testData/ast/inProjectionType/method/methodParams.jav similarity index 100% rename from testData/inProjectionType/method/methodParams.jav rename to testData/ast/inProjectionType/method/methodParams.jav diff --git a/testData/inProjectionType/method/methodParams.kt b/testData/ast/inProjectionType/method/methodParams.kt similarity index 100% rename from testData/inProjectionType/method/methodParams.kt rename to testData/ast/inProjectionType/method/methodParams.kt diff --git a/testData/isOperator/expression_mult/complicatedExpression.jav b/testData/ast/isOperator/expression_mult/complicatedExpression.jav similarity index 100% rename from testData/isOperator/expression_mult/complicatedExpression.jav rename to testData/ast/isOperator/expression_mult/complicatedExpression.jav diff --git a/testData/isOperator/expression_mult/complicatedExpression.kt b/testData/ast/isOperator/expression_mult/complicatedExpression.kt similarity index 100% rename from testData/isOperator/expression_mult/complicatedExpression.kt rename to testData/ast/isOperator/expression_mult/complicatedExpression.kt diff --git a/testData/isOperator/expression_mult/simpleReference.jav b/testData/ast/isOperator/expression_mult/simpleReference.jav similarity index 100% rename from testData/isOperator/expression_mult/simpleReference.jav rename to testData/ast/isOperator/expression_mult/simpleReference.jav diff --git a/testData/isOperator/expression_mult/simpleReference.kt b/testData/ast/isOperator/expression_mult/simpleReference.kt similarity index 100% rename from testData/isOperator/expression_mult/simpleReference.kt rename to testData/ast/isOperator/expression_mult/simpleReference.kt diff --git a/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav b/testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav similarity index 100% rename from testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav rename to testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav diff --git a/testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt b/testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt similarity index 100% rename from testData/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt rename to testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt diff --git a/testData/localVariable/statement/object.jav b/testData/ast/localVariable/statement/object.jav similarity index 100% rename from testData/localVariable/statement/object.jav rename to testData/ast/localVariable/statement/object.jav diff --git a/testData/localVariable/statement/object.kt b/testData/ast/localVariable/statement/object.kt similarity index 100% rename from testData/localVariable/statement/object.kt rename to testData/ast/localVariable/statement/object.kt diff --git a/testData/methodCallExpression/statement/callWithKeywords.jav b/testData/ast/methodCallExpression/statement/callWithKeywords.jav similarity index 100% rename from testData/methodCallExpression/statement/callWithKeywords.jav rename to testData/ast/methodCallExpression/statement/callWithKeywords.jav diff --git a/testData/methodCallExpression/statement/callWithKeywords.kt b/testData/ast/methodCallExpression/statement/callWithKeywords.kt similarity index 100% rename from testData/methodCallExpression/statement/callWithKeywords.kt rename to testData/ast/methodCallExpression/statement/callWithKeywords.kt diff --git a/testData/methodCallExpression/statement/emptyCall.jav b/testData/ast/methodCallExpression/statement/emptyCall.jav similarity index 100% rename from testData/methodCallExpression/statement/emptyCall.jav rename to testData/ast/methodCallExpression/statement/emptyCall.jav diff --git a/testData/methodCallExpression/statement/emptyCall.kt b/testData/ast/methodCallExpression/statement/emptyCall.kt similarity index 100% rename from testData/methodCallExpression/statement/emptyCall.kt rename to testData/ast/methodCallExpression/statement/emptyCall.kt diff --git a/testData/methodCallExpression/statement/simpleCall.jav b/testData/ast/methodCallExpression/statement/simpleCall.jav similarity index 100% rename from testData/methodCallExpression/statement/simpleCall.jav rename to testData/ast/methodCallExpression/statement/simpleCall.jav diff --git a/testData/methodCallExpression/statement/simpleCall.kt b/testData/ast/methodCallExpression/statement/simpleCall.kt similarity index 100% rename from testData/methodCallExpression/statement/simpleCall.kt rename to testData/ast/methodCallExpression/statement/simpleCall.kt diff --git a/testData/newClassExpression/expression/classWithParam.jav b/testData/ast/newClassExpression/expression/classWithParam.jav similarity index 100% rename from testData/newClassExpression/expression/classWithParam.jav rename to testData/ast/newClassExpression/expression/classWithParam.jav diff --git a/testData/newClassExpression/expression/classWithParam.kt b/testData/ast/newClassExpression/expression/classWithParam.kt similarity index 100% rename from testData/newClassExpression/expression/classWithParam.kt rename to testData/ast/newClassExpression/expression/classWithParam.kt diff --git a/testData/newClassExpression/expression/classWithParams.jav b/testData/ast/newClassExpression/expression/classWithParams.jav similarity index 100% rename from testData/newClassExpression/expression/classWithParams.jav rename to testData/ast/newClassExpression/expression/classWithParams.jav diff --git a/testData/newClassExpression/expression/classWithParams.kt b/testData/ast/newClassExpression/expression/classWithParams.kt similarity index 100% rename from testData/newClassExpression/expression/classWithParams.kt rename to testData/ast/newClassExpression/expression/classWithParams.kt diff --git a/testData/newClassExpression/expression/classWithoutBody.jav b/testData/ast/newClassExpression/expression/classWithoutBody.jav similarity index 100% rename from testData/newClassExpression/expression/classWithoutBody.jav rename to testData/ast/newClassExpression/expression/classWithoutBody.jav diff --git a/testData/newClassExpression/expression/classWithoutBody.kt b/testData/ast/newClassExpression/expression/classWithoutBody.kt similarity index 100% rename from testData/newClassExpression/expression/classWithoutBody.kt rename to testData/ast/newClassExpression/expression/classWithoutBody.kt diff --git a/testData/newClassExpression/expression/classWithoutBody2.jav b/testData/ast/newClassExpression/expression/classWithoutBody2.jav similarity index 100% rename from testData/newClassExpression/expression/classWithoutBody2.jav rename to testData/ast/newClassExpression/expression/classWithoutBody2.jav diff --git a/testData/newClassExpression/expression/classWithoutBody2.kt b/testData/ast/newClassExpression/expression/classWithoutBody2.kt similarity index 100% rename from testData/newClassExpression/expression/classWithoutBody2.kt rename to testData/ast/newClassExpression/expression/classWithoutBody2.kt diff --git a/testData/outProjectionType/method/methodParams.jav b/testData/ast/outProjectionType/method/methodParams.jav similarity index 100% rename from testData/outProjectionType/method/methodParams.jav rename to testData/ast/outProjectionType/method/methodParams.jav diff --git a/testData/outProjectionType/method/methodParams.kt b/testData/ast/outProjectionType/method/methodParams.kt similarity index 100% rename from testData/outProjectionType/method/methodParams.kt rename to testData/ast/outProjectionType/method/methodParams.kt diff --git a/testData/parenthesizedExpression/expression/parenthesized.jav b/testData/ast/parenthesizedExpression/expression/parenthesized.jav similarity index 100% rename from testData/parenthesizedExpression/expression/parenthesized.jav rename to testData/ast/parenthesizedExpression/expression/parenthesized.jav diff --git a/testData/parenthesizedExpression/expression/parenthesized.kt b/testData/ast/parenthesizedExpression/expression/parenthesized.kt similarity index 100% rename from testData/parenthesizedExpression/expression/parenthesized.kt rename to testData/ast/parenthesizedExpression/expression/parenthesized.kt diff --git a/testData/parenthesizedExpression/expression/parenthesized2.jav b/testData/ast/parenthesizedExpression/expression/parenthesized2.jav similarity index 100% rename from testData/parenthesizedExpression/expression/parenthesized2.jav rename to testData/ast/parenthesizedExpression/expression/parenthesized2.jav diff --git a/testData/parenthesizedExpression/expression/parenthesized2.kt b/testData/ast/parenthesizedExpression/expression/parenthesized2.kt similarity index 100% rename from testData/parenthesizedExpression/expression/parenthesized2.kt rename to testData/ast/parenthesizedExpression/expression/parenthesized2.kt diff --git a/testData/polyadicExpression/expression_mult/divide.jav b/testData/ast/polyadicExpression/expression_mult/divide.jav similarity index 100% rename from testData/polyadicExpression/expression_mult/divide.jav rename to testData/ast/polyadicExpression/expression_mult/divide.jav diff --git a/testData/polyadicExpression/expression_mult/divide.kt b/testData/ast/polyadicExpression/expression_mult/divide.kt similarity index 100% rename from testData/polyadicExpression/expression_mult/divide.kt rename to testData/ast/polyadicExpression/expression_mult/divide.kt diff --git a/testData/polyadicExpression/expression_mult/minus.jav b/testData/ast/polyadicExpression/expression_mult/minus.jav similarity index 100% rename from testData/polyadicExpression/expression_mult/minus.jav rename to testData/ast/polyadicExpression/expression_mult/minus.jav diff --git a/testData/polyadicExpression/expression_mult/minus.kt b/testData/ast/polyadicExpression/expression_mult/minus.kt similarity index 100% rename from testData/polyadicExpression/expression_mult/minus.kt rename to testData/ast/polyadicExpression/expression_mult/minus.kt diff --git a/testData/polyadicExpression/expression_mult/multiply.jav b/testData/ast/polyadicExpression/expression_mult/multiply.jav similarity index 100% rename from testData/polyadicExpression/expression_mult/multiply.jav rename to testData/ast/polyadicExpression/expression_mult/multiply.jav diff --git a/testData/polyadicExpression/expression_mult/multiply.kt b/testData/ast/polyadicExpression/expression_mult/multiply.kt similarity index 100% rename from testData/polyadicExpression/expression_mult/multiply.kt rename to testData/ast/polyadicExpression/expression_mult/multiply.kt diff --git a/testData/polyadicExpression/expression_mult/plus.jav b/testData/ast/polyadicExpression/expression_mult/plus.jav similarity index 100% rename from testData/polyadicExpression/expression_mult/plus.jav rename to testData/ast/polyadicExpression/expression_mult/plus.jav diff --git a/testData/polyadicExpression/expression_mult/plus.kt b/testData/ast/polyadicExpression/expression_mult/plus.kt similarity index 100% rename from testData/polyadicExpression/expression_mult/plus.kt rename to testData/ast/polyadicExpression/expression_mult/plus.kt diff --git a/testData/polyadicExpression/expression_mult/remainder.jav b/testData/ast/polyadicExpression/expression_mult/remainder.jav similarity index 100% rename from testData/polyadicExpression/expression_mult/remainder.jav rename to testData/ast/polyadicExpression/expression_mult/remainder.jav diff --git a/testData/polyadicExpression/expression_mult/remainder.kt b/testData/ast/polyadicExpression/expression_mult/remainder.kt similarity index 100% rename from testData/polyadicExpression/expression_mult/remainder.kt rename to testData/ast/polyadicExpression/expression_mult/remainder.kt diff --git a/testData/postfixOperator/statement_mult/decrement.jav b/testData/ast/postfixOperator/statement_mult/decrement.jav similarity index 100% rename from testData/postfixOperator/statement_mult/decrement.jav rename to testData/ast/postfixOperator/statement_mult/decrement.jav diff --git a/testData/postfixOperator/statement_mult/decrement.kt b/testData/ast/postfixOperator/statement_mult/decrement.kt similarity index 100% rename from testData/postfixOperator/statement_mult/decrement.kt rename to testData/ast/postfixOperator/statement_mult/decrement.kt diff --git a/testData/postfixOperator/statement_mult/increment.jav b/testData/ast/postfixOperator/statement_mult/increment.jav similarity index 100% rename from testData/postfixOperator/statement_mult/increment.jav rename to testData/ast/postfixOperator/statement_mult/increment.jav diff --git a/testData/postfixOperator/statement_mult/increment.kt b/testData/ast/postfixOperator/statement_mult/increment.kt similarity index 100% rename from testData/postfixOperator/statement_mult/increment.kt rename to testData/ast/postfixOperator/statement_mult/increment.kt diff --git a/testData/prefixOperator/statement_mult/decrement.jav b/testData/ast/prefixOperator/statement_mult/decrement.jav similarity index 100% rename from testData/prefixOperator/statement_mult/decrement.jav rename to testData/ast/prefixOperator/statement_mult/decrement.jav diff --git a/testData/prefixOperator/statement_mult/decrement.kt b/testData/ast/prefixOperator/statement_mult/decrement.kt similarity index 100% rename from testData/prefixOperator/statement_mult/decrement.kt rename to testData/ast/prefixOperator/statement_mult/decrement.kt diff --git a/testData/prefixOperator/statement_mult/increment.jav b/testData/ast/prefixOperator/statement_mult/increment.jav similarity index 100% rename from testData/prefixOperator/statement_mult/increment.jav rename to testData/ast/prefixOperator/statement_mult/increment.jav diff --git a/testData/prefixOperator/statement_mult/increment.kt b/testData/ast/prefixOperator/statement_mult/increment.kt similarity index 100% rename from testData/prefixOperator/statement_mult/increment.kt rename to testData/ast/prefixOperator/statement_mult/increment.kt diff --git a/testData/returnStatement/statement/returnChar.jav b/testData/ast/returnStatement/statement/returnChar.jav similarity index 100% rename from testData/returnStatement/statement/returnChar.jav rename to testData/ast/returnStatement/statement/returnChar.jav diff --git a/testData/returnStatement/statement/returnChar.kt b/testData/ast/returnStatement/statement/returnChar.kt similarity index 100% rename from testData/returnStatement/statement/returnChar.kt rename to testData/ast/returnStatement/statement/returnChar.kt diff --git a/testData/returnStatement/statement/returnLiteral.jav b/testData/ast/returnStatement/statement/returnLiteral.jav similarity index 100% rename from testData/returnStatement/statement/returnLiteral.jav rename to testData/ast/returnStatement/statement/returnLiteral.jav diff --git a/testData/returnStatement/statement/returnLiteral.kt b/testData/ast/returnStatement/statement/returnLiteral.kt similarity index 100% rename from testData/returnStatement/statement/returnLiteral.kt rename to testData/ast/returnStatement/statement/returnLiteral.kt diff --git a/testData/returnStatement/statement/returnNumber.jav b/testData/ast/returnStatement/statement/returnNumber.jav similarity index 100% rename from testData/returnStatement/statement/returnNumber.jav rename to testData/ast/returnStatement/statement/returnNumber.jav diff --git a/testData/returnStatement/statement/returnNumber.kt b/testData/ast/returnStatement/statement/returnNumber.kt similarity index 100% rename from testData/returnStatement/statement/returnNumber.kt rename to testData/ast/returnStatement/statement/returnNumber.kt diff --git a/testData/returnStatement/statement/returnString.jav b/testData/ast/returnStatement/statement/returnString.jav similarity index 100% rename from testData/returnStatement/statement/returnString.jav rename to testData/ast/returnStatement/statement/returnString.jav diff --git a/testData/returnStatement/statement/returnString.kt b/testData/ast/returnStatement/statement/returnString.kt similarity index 100% rename from testData/returnStatement/statement/returnString.kt rename to testData/ast/returnStatement/statement/returnString.kt diff --git a/testData/starProjectionType/method/methodParams.jav b/testData/ast/starProjectionType/method/methodParams.jav similarity index 100% rename from testData/starProjectionType/method/methodParams.jav rename to testData/ast/starProjectionType/method/methodParams.jav diff --git a/testData/starProjectionType/method/methodParams.kt b/testData/ast/starProjectionType/method/methodParams.kt similarity index 100% rename from testData/starProjectionType/method/methodParams.kt rename to testData/ast/starProjectionType/method/methodParams.kt diff --git a/testData/synchronizedStatement/statement/singleLineExample.jav b/testData/ast/synchronizedStatement/statement/singleLineExample.jav similarity index 100% rename from testData/synchronizedStatement/statement/singleLineExample.jav rename to testData/ast/synchronizedStatement/statement/singleLineExample.jav diff --git a/testData/synchronizedStatement/statement/singleLineExample.kt b/testData/ast/synchronizedStatement/statement/singleLineExample.kt similarity index 100% rename from testData/synchronizedStatement/statement/singleLineExample.kt rename to testData/ast/synchronizedStatement/statement/singleLineExample.kt diff --git a/testData/throwStatement/statement/simpleThrowStatement.jav b/testData/ast/throwStatement/statement/simpleThrowStatement.jav similarity index 100% rename from testData/throwStatement/statement/simpleThrowStatement.jav rename to testData/ast/throwStatement/statement/simpleThrowStatement.jav diff --git a/testData/throwStatement/statement/simpleThrowStatement.kt b/testData/ast/throwStatement/statement/simpleThrowStatement.kt similarity index 100% rename from testData/throwStatement/statement/simpleThrowStatement.kt rename to testData/ast/throwStatement/statement/simpleThrowStatement.kt diff --git a/testData/trait/class/emptyInterface.jav b/testData/ast/trait/class/emptyInterface.jav similarity index 100% rename from testData/trait/class/emptyInterface.jav rename to testData/ast/trait/class/emptyInterface.jav diff --git a/testData/trait/class/emptyInterface.kt b/testData/ast/trait/class/emptyInterface.kt similarity index 100% rename from testData/trait/class/emptyInterface.kt rename to testData/ast/trait/class/emptyInterface.kt diff --git a/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav similarity index 100% rename from testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav rename to testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav diff --git a/testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt similarity index 100% rename from testData/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt rename to testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt diff --git a/testData/trait/class/extendsOneInterface.jav b/testData/ast/trait/class/extendsOneInterface.jav similarity index 100% rename from testData/trait/class/extendsOneInterface.jav rename to testData/ast/trait/class/extendsOneInterface.jav diff --git a/testData/trait/class/extendsOneInterface.kt b/testData/ast/trait/class/extendsOneInterface.kt similarity index 100% rename from testData/trait/class/extendsOneInterface.kt rename to testData/ast/trait/class/extendsOneInterface.kt diff --git a/testData/trait/class/internalInterface.jav b/testData/ast/trait/class/internalInterface.jav similarity index 100% rename from testData/trait/class/internalInterface.jav rename to testData/ast/trait/class/internalInterface.jav diff --git a/testData/trait/class/internalInterface.kt b/testData/ast/trait/class/internalInterface.kt similarity index 100% rename from testData/trait/class/internalInterface.kt rename to testData/ast/trait/class/internalInterface.kt diff --git a/testData/trait/class/privateInterface.jav b/testData/ast/trait/class/privateInterface.jav similarity index 100% rename from testData/trait/class/privateInterface.jav rename to testData/ast/trait/class/privateInterface.jav diff --git a/testData/trait/class/privateInterface.kt b/testData/ast/trait/class/privateInterface.kt similarity index 100% rename from testData/trait/class/privateInterface.kt rename to testData/ast/trait/class/privateInterface.kt diff --git a/testData/trait/class/protectedInterface.jav b/testData/ast/trait/class/protectedInterface.jav similarity index 100% rename from testData/trait/class/protectedInterface.jav rename to testData/ast/trait/class/protectedInterface.jav diff --git a/testData/trait/class/protectedInterface.kt b/testData/ast/trait/class/protectedInterface.kt similarity index 100% rename from testData/trait/class/protectedInterface.kt rename to testData/ast/trait/class/protectedInterface.kt diff --git a/testData/trait/class/publicInterface.jav b/testData/ast/trait/class/publicInterface.jav similarity index 100% rename from testData/trait/class/publicInterface.jav rename to testData/ast/trait/class/publicInterface.jav diff --git a/testData/trait/class/publicInterface.kt b/testData/ast/trait/class/publicInterface.kt similarity index 100% rename from testData/trait/class/publicInterface.kt rename to testData/ast/trait/class/publicInterface.kt diff --git a/testData/trait/class_mult/interfaceWithFields.jav b/testData/ast/trait/class_mult/interfaceWithFields.jav similarity index 100% rename from testData/trait/class_mult/interfaceWithFields.jav rename to testData/ast/trait/class_mult/interfaceWithFields.jav diff --git a/testData/trait/class_mult/interfaceWithFields.kt b/testData/ast/trait/class_mult/interfaceWithFields.kt similarity index 100% rename from testData/trait/class_mult/interfaceWithFields.kt rename to testData/ast/trait/class_mult/interfaceWithFields.kt diff --git a/testData/trait/class_mult/interfaceWithMethodDeclaration.jav b/testData/ast/trait/class_mult/interfaceWithMethodDeclaration.jav similarity index 100% rename from testData/trait/class_mult/interfaceWithMethodDeclaration.jav rename to testData/ast/trait/class_mult/interfaceWithMethodDeclaration.jav diff --git a/testData/trait/class_mult/interfaceWithMethodDeclaration.kt b/testData/ast/trait/class_mult/interfaceWithMethodDeclaration.kt similarity index 100% rename from testData/trait/class_mult/interfaceWithMethodDeclaration.kt rename to testData/ast/trait/class_mult/interfaceWithMethodDeclaration.kt diff --git a/testData/trait/class_mult/interfaceWithStaticFields.jav b/testData/ast/trait/class_mult/interfaceWithStaticFields.jav similarity index 100% rename from testData/trait/class_mult/interfaceWithStaticFields.jav rename to testData/ast/trait/class_mult/interfaceWithStaticFields.jav diff --git a/testData/trait/class_mult/interfaceWithStaticFields.kt b/testData/ast/trait/class_mult/interfaceWithStaticFields.kt similarity index 100% rename from testData/trait/class_mult/interfaceWithStaticFields.kt rename to testData/ast/trait/class_mult/interfaceWithStaticFields.kt diff --git a/testData/tryStatement/statement_mult/commonCaseForTryStatement.jav b/testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.jav similarity index 100% rename from testData/tryStatement/statement_mult/commonCaseForTryStatement.jav rename to testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.jav diff --git a/testData/tryStatement/statement_mult/commonCaseForTryStatement.kt b/testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.kt similarity index 100% rename from testData/tryStatement/statement_mult/commonCaseForTryStatement.kt rename to testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.kt diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav b/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav similarity index 100% rename from testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav rename to testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt b/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt similarity index 100% rename from testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt rename to testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav b/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav similarity index 100% rename from testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav rename to testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt b/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt similarity index 100% rename from testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt rename to testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav b/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav similarity index 100% rename from testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav rename to testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav diff --git a/testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt b/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt similarity index 100% rename from testData/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt rename to testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt diff --git a/testData/typeCastExpression/expression_mult/extendsWildcardCast.jav b/testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/extendsWildcardCast.jav rename to testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.jav diff --git a/testData/typeCastExpression/expression_mult/extendsWildcardCast.kt b/testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/extendsWildcardCast.kt rename to testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.kt diff --git a/testData/typeCastExpression/expression_mult/fooCast.jav b/testData/ast/typeCastExpression/expression_mult/fooCast.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/fooCast.jav rename to testData/ast/typeCastExpression/expression_mult/fooCast.jav diff --git a/testData/typeCastExpression/expression_mult/fooCast.kt b/testData/ast/typeCastExpression/expression_mult/fooCast.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/fooCast.kt rename to testData/ast/typeCastExpression/expression_mult/fooCast.kt diff --git a/testData/typeCastExpression/expression_mult/intCast.jav b/testData/ast/typeCastExpression/expression_mult/intCast.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/intCast.jav rename to testData/ast/typeCastExpression/expression_mult/intCast.jav diff --git a/testData/typeCastExpression/expression_mult/intCast.kt b/testData/ast/typeCastExpression/expression_mult/intCast.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/intCast.kt rename to testData/ast/typeCastExpression/expression_mult/intCast.kt diff --git a/testData/typeCastExpression/expression_mult/primitiveType.jav b/testData/ast/typeCastExpression/expression_mult/primitiveType.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/primitiveType.jav rename to testData/ast/typeCastExpression/expression_mult/primitiveType.jav diff --git a/testData/typeCastExpression/expression_mult/primitiveType.kt b/testData/ast/typeCastExpression/expression_mult/primitiveType.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/primitiveType.kt rename to testData/ast/typeCastExpression/expression_mult/primitiveType.kt diff --git a/testData/typeCastExpression/expression_mult/simpleGenericCast.jav b/testData/ast/typeCastExpression/expression_mult/simpleGenericCast.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/simpleGenericCast.jav rename to testData/ast/typeCastExpression/expression_mult/simpleGenericCast.jav diff --git a/testData/typeCastExpression/expression_mult/simpleGenericCast.kt b/testData/ast/typeCastExpression/expression_mult/simpleGenericCast.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/simpleGenericCast.kt rename to testData/ast/typeCastExpression/expression_mult/simpleGenericCast.kt diff --git a/testData/typeCastExpression/expression_mult/stringCast.jav b/testData/ast/typeCastExpression/expression_mult/stringCast.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/stringCast.jav rename to testData/ast/typeCastExpression/expression_mult/stringCast.jav diff --git a/testData/typeCastExpression/expression_mult/stringCast.kt b/testData/ast/typeCastExpression/expression_mult/stringCast.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/stringCast.kt rename to testData/ast/typeCastExpression/expression_mult/stringCast.kt diff --git a/testData/typeCastExpression/expression_mult/superWildcardCast.jav b/testData/ast/typeCastExpression/expression_mult/superWildcardCast.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/superWildcardCast.jav rename to testData/ast/typeCastExpression/expression_mult/superWildcardCast.jav diff --git a/testData/typeCastExpression/expression_mult/superWildcardCast.kt b/testData/ast/typeCastExpression/expression_mult/superWildcardCast.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/superWildcardCast.kt rename to testData/ast/typeCastExpression/expression_mult/superWildcardCast.kt diff --git a/testData/typeCastExpression/expression_mult/wildcardCast.jav b/testData/ast/typeCastExpression/expression_mult/wildcardCast.jav similarity index 100% rename from testData/typeCastExpression/expression_mult/wildcardCast.jav rename to testData/ast/typeCastExpression/expression_mult/wildcardCast.jav diff --git a/testData/typeCastExpression/expression_mult/wildcardCast.kt b/testData/ast/typeCastExpression/expression_mult/wildcardCast.kt similarity index 100% rename from testData/typeCastExpression/expression_mult/wildcardCast.kt rename to testData/ast/typeCastExpression/expression_mult/wildcardCast.kt diff --git a/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav b/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav similarity index 100% rename from testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav rename to testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav diff --git a/testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from testData/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt rename to testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt diff --git a/testData/typeParameters/class/classParametrizationWithTwoBounds.jav b/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav similarity index 100% rename from testData/typeParameters/class/classParametrizationWithTwoBounds.jav rename to testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav diff --git a/testData/typeParameters/class/classParametrizationWithTwoBounds.kt b/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt similarity index 100% rename from testData/typeParameters/class/classParametrizationWithTwoBounds.kt rename to testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt diff --git a/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav b/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav similarity index 100% rename from testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav rename to testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav diff --git a/testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt b/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from testData/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt rename to testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt diff --git a/testData/typeParameters/class/complexExampleWithClassExtending.jav b/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav similarity index 100% rename from testData/typeParameters/class/complexExampleWithClassExtending.jav rename to testData/ast/typeParameters/class/complexExampleWithClassExtending.jav diff --git a/testData/typeParameters/class/complexExampleWithClassExtending.kt b/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt similarity index 100% rename from testData/typeParameters/class/complexExampleWithClassExtending.kt rename to testData/ast/typeParameters/class/complexExampleWithClassExtending.kt diff --git a/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.jav b/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav similarity index 100% rename from testData/typeParameters/class/complexExampleWithClassMultiplyExtending.jav rename to testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav diff --git a/testData/typeParameters/class/complexExampleWithClassMultiplyExtending.kt b/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt similarity index 100% rename from testData/typeParameters/class/complexExampleWithClassMultiplyExtending.kt rename to testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt diff --git a/testData/typeParameters/class/genericClass.jav b/testData/ast/typeParameters/class/genericClass.jav similarity index 100% rename from testData/typeParameters/class/genericClass.jav rename to testData/ast/typeParameters/class/genericClass.jav diff --git a/testData/typeParameters/class/genericClass.kt b/testData/ast/typeParameters/class/genericClass.kt similarity index 100% rename from testData/typeParameters/class/genericClass.kt rename to testData/ast/typeParameters/class/genericClass.kt diff --git a/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav b/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav similarity index 100% rename from testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav rename to testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav diff --git a/testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from testData/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt rename to testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt diff --git a/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav b/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav similarity index 100% rename from testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav rename to testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav diff --git a/testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt b/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt similarity index 100% rename from testData/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt rename to testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt diff --git a/testData/typeParameters/method/where.jav b/testData/ast/typeParameters/method/where.jav similarity index 100% rename from testData/typeParameters/method/where.jav rename to testData/ast/typeParameters/method/where.jav diff --git a/testData/typeParameters/method/where.kt b/testData/ast/typeParameters/method/where.kt similarity index 100% rename from testData/typeParameters/method/where.kt rename to testData/ast/typeParameters/method/where.kt diff --git a/testData/typeParameters/statement_mult/genericParam.jav b/testData/ast/typeParameters/statement_mult/genericParam.jav similarity index 100% rename from testData/typeParameters/statement_mult/genericParam.jav rename to testData/ast/typeParameters/statement_mult/genericParam.jav diff --git a/testData/typeParameters/statement_mult/genericParam.kt b/testData/ast/typeParameters/statement_mult/genericParam.kt similarity index 100% rename from testData/typeParameters/statement_mult/genericParam.kt rename to testData/ast/typeParameters/statement_mult/genericParam.kt diff --git a/testData/typeParameters/statement_mult/manyGenericParams.jav b/testData/ast/typeParameters/statement_mult/manyGenericParams.jav similarity index 100% rename from testData/typeParameters/statement_mult/manyGenericParams.jav rename to testData/ast/typeParameters/statement_mult/manyGenericParams.jav diff --git a/testData/typeParameters/statement_mult/manyGenericParams.kt b/testData/ast/typeParameters/statement_mult/manyGenericParams.kt similarity index 100% rename from testData/typeParameters/statement_mult/manyGenericParams.kt rename to testData/ast/typeParameters/statement_mult/manyGenericParams.kt diff --git a/testData/varArg/method/ellipsisTypeSeveralParams.jav b/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav similarity index 100% rename from testData/varArg/method/ellipsisTypeSeveralParams.jav rename to testData/ast/varArg/method/ellipsisTypeSeveralParams.jav diff --git a/testData/varArg/method/ellipsisTypeSeveralParams.kt b/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt similarity index 100% rename from testData/varArg/method/ellipsisTypeSeveralParams.kt rename to testData/ast/varArg/method/ellipsisTypeSeveralParams.kt diff --git a/testData/varArg/method/ellipsisTypeSingleParams.jav b/testData/ast/varArg/method/ellipsisTypeSingleParams.jav similarity index 100% rename from testData/varArg/method/ellipsisTypeSingleParams.jav rename to testData/ast/varArg/method/ellipsisTypeSingleParams.jav diff --git a/testData/varArg/method/ellipsisTypeSingleParams.kt b/testData/ast/varArg/method/ellipsisTypeSingleParams.kt similarity index 100% rename from testData/varArg/method/ellipsisTypeSingleParams.kt rename to testData/ast/varArg/method/ellipsisTypeSingleParams.kt diff --git a/testData/whileStatement/statement_mult/whileWithBlock.jav b/testData/ast/whileStatement/statement_mult/whileWithBlock.jav similarity index 100% rename from testData/whileStatement/statement_mult/whileWithBlock.jav rename to testData/ast/whileStatement/statement_mult/whileWithBlock.jav diff --git a/testData/whileStatement/statement_mult/whileWithBlock.kt b/testData/ast/whileStatement/statement_mult/whileWithBlock.kt similarity index 100% rename from testData/whileStatement/statement_mult/whileWithBlock.kt rename to testData/ast/whileStatement/statement_mult/whileWithBlock.kt diff --git a/testData/whileStatement/statement_mult/whileWithEmptyBlock.jav b/testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.jav similarity index 100% rename from testData/whileStatement/statement_mult/whileWithEmptyBlock.jav rename to testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.jav diff --git a/testData/whileStatement/statement_mult/whileWithEmptyBlock.kt b/testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.kt similarity index 100% rename from testData/whileStatement/statement_mult/whileWithEmptyBlock.kt rename to testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.kt diff --git a/testData/whileStatement/statement_mult/whileWithExpression.jav b/testData/ast/whileStatement/statement_mult/whileWithExpression.jav similarity index 100% rename from testData/whileStatement/statement_mult/whileWithExpression.jav rename to testData/ast/whileStatement/statement_mult/whileWithExpression.jav diff --git a/testData/whileStatement/statement_mult/whileWithExpression.kt b/testData/ast/whileStatement/statement_mult/whileWithExpression.kt similarity index 100% rename from testData/whileStatement/statement_mult/whileWithExpression.kt rename to testData/ast/whileStatement/statement_mult/whileWithExpression.kt diff --git a/testData/whileStatement/statement_mult/whileWithReturn.jav b/testData/ast/whileStatement/statement_mult/whileWithReturn.jav similarity index 100% rename from testData/whileStatement/statement_mult/whileWithReturn.jav rename to testData/ast/whileStatement/statement_mult/whileWithReturn.jav diff --git a/testData/whileStatement/statement_mult/whileWithReturn.kt b/testData/ast/whileStatement/statement_mult/whileWithReturn.kt similarity index 100% rename from testData/whileStatement/statement_mult/whileWithReturn.kt rename to testData/ast/whileStatement/statement_mult/whileWithReturn.kt