diff --git a/.idea/modules.xml b/.idea/modules.xml index e12dd594db4..d171cde374e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -13,6 +13,7 @@ + diff --git a/.idea/runConfigurations/All_Compiler_Tests.xml b/.idea/runConfigurations/All_Compiler_Tests.xml new file mode 100644 index 00000000000..514a9de15e3 --- /dev/null +++ b/.idea/runConfigurations/All_Compiler_Tests.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml b/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml new file mode 100644 index 00000000000..4bb5e716741 --- /dev/null +++ b/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml index 85e2275839b..e338f35386c 100644 --- a/.idea/runConfigurations/All_Tests.xml +++ b/.idea/runConfigurations/All_Tests.xml @@ -19,7 +19,7 @@ @@ -29,7 +29,7 @@ diff --git a/j2k/lib/commons-cli-1.2.jar b/j2k/lib/commons-cli-1.2.jar deleted file mode 100644 index ce4b9fffe40..00000000000 Binary files a/j2k/lib/commons-cli-1.2.jar and /dev/null differ diff --git a/j2k/lib/commons-io-2.1.jar b/j2k/lib/commons-io-2.1.jar deleted file mode 100644 index b5c7d692fe5..00000000000 Binary files a/j2k/lib/commons-io-2.1.jar and /dev/null differ diff --git a/j2k/tests/j2k-tests.iml b/j2k/tests/j2k-tests.iml new file mode 100644 index 00000000000..d7242d8cc89 --- /dev/null +++ b/j2k/tests/j2k-tests.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/j2k/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java b/j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java similarity index 100% rename from j2k/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java rename to j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java diff --git a/j2k/test/org/jetbrains/jet/j2k/TestCaseBuilder.java b/j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java similarity index 100% rename from j2k/test/org/jetbrains/jet/j2k/TestCaseBuilder.java rename to j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java diff --git a/j2k/testData/ast/annotations/file/jetbrainsNotNull.jav b/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.jav similarity index 100% rename from j2k/testData/ast/annotations/file/jetbrainsNotNull.jav rename to j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.jav diff --git a/j2k/testData/ast/annotations/file/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt similarity index 100% rename from j2k/testData/ast/annotations/file/jetbrainsNotNull.kt rename to j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt diff --git a/j2k/testData/ast/anonymousBlock/file/oneAnonBlock.jav b/j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav similarity index 100% rename from j2k/testData/ast/anonymousBlock/file/oneAnonBlock.jav rename to j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav diff --git a/j2k/testData/ast/anonymousBlock/file/oneAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.kt similarity index 100% rename from j2k/testData/ast/anonymousBlock/file/oneAnonBlock.kt rename to j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.kt diff --git a/j2k/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav b/j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav similarity index 100% rename from j2k/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav rename to j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav diff --git a/j2k/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt similarity index 100% rename from j2k/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt rename to j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt diff --git a/j2k/testData/ast/arrayAccessExpression/expression/expressionIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.jav similarity index 100% rename from j2k/testData/ast/arrayAccessExpression/expression/expressionIndex.jav rename to j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.jav diff --git a/j2k/testData/ast/arrayAccessExpression/expression/expressionIndex.kt b/j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.kt similarity index 100% rename from j2k/testData/ast/arrayAccessExpression/expression/expressionIndex.kt rename to j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.kt diff --git a/j2k/testData/ast/arrayAccessExpression/expression/intIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.jav similarity index 100% rename from j2k/testData/ast/arrayAccessExpression/expression/intIndex.jav rename to j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.jav diff --git a/j2k/testData/ast/arrayAccessExpression/expression/intIndex.kt b/j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.kt similarity index 100% rename from j2k/testData/ast/arrayAccessExpression/expression/intIndex.kt rename to j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.kt diff --git a/j2k/testData/ast/arrayAccessExpression/expression/variableIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.jav similarity index 100% rename from j2k/testData/ast/arrayAccessExpression/expression/variableIndex.jav rename to j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.jav diff --git a/j2k/testData/ast/arrayAccessExpression/expression/variableIndex.kt b/j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.kt similarity index 100% rename from j2k/testData/ast/arrayAccessExpression/expression/variableIndex.kt rename to j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/expression/newInt.jav b/j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/expression/newInt.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/expression/newInt.kt b/j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/expression/newInt.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/doubleArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/doubleArray.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/doubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/doubleArray.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/floatArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/floatArray.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/floatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/floatArray.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/newByte.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/newByte.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/newByte.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/newByte.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/oneDim.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/oneDim.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/oneDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/oneDim.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/twoDim.jav b/j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/twoDim.jav rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav diff --git a/j2k/testData/ast/arrayInitializerExpression/statement/twoDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.kt similarity index 100% rename from j2k/testData/ast/arrayInitializerExpression/statement/twoDim.kt rename to j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.kt diff --git a/j2k/testData/ast/arrayType/method/methodArrayArgs.jav b/j2k/tests/testData/ast/arrayType/method/methodArrayArgs.jav similarity index 100% rename from j2k/testData/ast/arrayType/method/methodArrayArgs.jav rename to j2k/tests/testData/ast/arrayType/method/methodArrayArgs.jav diff --git a/j2k/testData/ast/arrayType/method/methodArrayArgs.kt b/j2k/tests/testData/ast/arrayType/method/methodArrayArgs.kt similarity index 100% rename from j2k/testData/ast/arrayType/method/methodArrayArgs.kt rename to j2k/tests/testData/ast/arrayType/method/methodArrayArgs.kt diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatement.jav b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatement.jav rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatement.kt b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatement.kt rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.kt diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav diff --git a/j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt b/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt rename to j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt diff --git a/j2k/testData/ast/arrayType/statement/d2StringEmptyArray.jav b/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/d2StringEmptyArray.jav rename to j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav diff --git a/j2k/testData/ast/arrayType/statement/d2StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/d2StringEmptyArray.kt rename to j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt diff --git a/j2k/testData/ast/arrayType/statement/d3StringEmptyArray.jav b/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/d3StringEmptyArray.jav rename to j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav diff --git a/j2k/testData/ast/arrayType/statement/d3StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/d3StringEmptyArray.kt rename to j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt diff --git a/j2k/testData/ast/arrayType/statement/longArray.jav b/j2k/tests/testData/ast/arrayType/statement/longArray.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/longArray.jav rename to j2k/tests/testData/ast/arrayType/statement/longArray.jav diff --git a/j2k/testData/ast/arrayType/statement/longArray.kt b/j2k/tests/testData/ast/arrayType/statement/longArray.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/longArray.kt rename to j2k/tests/testData/ast/arrayType/statement/longArray.kt diff --git a/j2k/testData/ast/arrayType/statement/newIntArray.jav b/j2k/tests/testData/ast/arrayType/statement/newIntArray.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/newIntArray.jav rename to j2k/tests/testData/ast/arrayType/statement/newIntArray.jav diff --git a/j2k/testData/ast/arrayType/statement/newIntArray.kt b/j2k/tests/testData/ast/arrayType/statement/newIntArray.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/newIntArray.kt rename to j2k/tests/testData/ast/arrayType/statement/newIntArray.kt diff --git a/j2k/testData/ast/arrayType/statement/newStringArray.jav b/j2k/tests/testData/ast/arrayType/statement/newStringArray.jav similarity index 100% rename from j2k/testData/ast/arrayType/statement/newStringArray.jav rename to j2k/tests/testData/ast/arrayType/statement/newStringArray.jav diff --git a/j2k/testData/ast/arrayType/statement/newStringArray.kt b/j2k/tests/testData/ast/arrayType/statement/newStringArray.kt similarity index 100% rename from j2k/testData/ast/arrayType/statement/newStringArray.kt rename to j2k/tests/testData/ast/arrayType/statement/newStringArray.kt diff --git a/j2k/testData/ast/assertStatement/statement/onlyCondition.jav b/j2k/tests/testData/ast/assertStatement/statement/onlyCondition.jav similarity index 100% rename from j2k/testData/ast/assertStatement/statement/onlyCondition.jav rename to j2k/tests/testData/ast/assertStatement/statement/onlyCondition.jav diff --git a/j2k/testData/ast/assertStatement/statement/onlyCondition.kt b/j2k/tests/testData/ast/assertStatement/statement/onlyCondition.kt similarity index 100% rename from j2k/testData/ast/assertStatement/statement/onlyCondition.kt rename to j2k/tests/testData/ast/assertStatement/statement/onlyCondition.kt diff --git a/j2k/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav b/j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav similarity index 100% rename from j2k/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav rename to j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav diff --git a/j2k/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt b/j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt similarity index 100% rename from j2k/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt rename to j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt diff --git a/j2k/testData/ast/assertStatement/statement/withStringDetail.jav b/j2k/tests/testData/ast/assertStatement/statement/withStringDetail.jav similarity index 100% rename from j2k/testData/ast/assertStatement/statement/withStringDetail.jav rename to j2k/tests/testData/ast/assertStatement/statement/withStringDetail.jav diff --git a/j2k/testData/ast/assertStatement/statement/withStringDetail.kt b/j2k/tests/testData/ast/assertStatement/statement/withStringDetail.kt similarity index 100% rename from j2k/testData/ast/assertStatement/statement/withStringDetail.kt rename to j2k/tests/testData/ast/assertStatement/statement/withStringDetail.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/and.jav b/j2k/tests/testData/ast/assignmentExpression/expression/and.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/and.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/and.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/and.kt b/j2k/tests/testData/ast/assignmentExpression/expression/and.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/and.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/and.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/assignment.jav b/j2k/tests/testData/ast/assignmentExpression/expression/assignment.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/assignment.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/assignment.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/assignment.kt b/j2k/tests/testData/ast/assignmentExpression/expression/assignment.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/assignment.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/assignment.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/divideAssign.jav b/j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/divideAssign.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/divideAssign.kt b/j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/divideAssign.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/minusAssign.jav b/j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/minusAssign.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/minusAssign.kt b/j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/minusAssign.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/multiplyAssign.jav b/j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/multiplyAssign.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/multiplyAssign.kt b/j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/multiplyAssign.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/or.jav b/j2k/tests/testData/ast/assignmentExpression/expression/or.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/or.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/or.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/or.kt b/j2k/tests/testData/ast/assignmentExpression/expression/or.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/or.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/or.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/plusAssign.jav b/j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/plusAssign.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/plusAssign.kt b/j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/plusAssign.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/reminder.jav b/j2k/tests/testData/ast/assignmentExpression/expression/reminder.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/reminder.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/reminder.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/reminder.kt b/j2k/tests/testData/ast/assignmentExpression/expression/reminder.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/reminder.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/reminder.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/shiftLeft.jav b/j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/shiftLeft.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/shiftLeft.kt b/j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/shiftLeft.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/shiftRight.jav b/j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/shiftRight.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/shiftRight.kt b/j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/shiftRight.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/unsignedRightShift.jav b/j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/unsignedRightShift.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/unsignedRightShift.kt b/j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/unsignedRightShift.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.kt diff --git a/j2k/testData/ast/assignmentExpression/expression/xor.jav b/j2k/tests/testData/ast/assignmentExpression/expression/xor.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/xor.jav rename to j2k/tests/testData/ast/assignmentExpression/expression/xor.jav diff --git a/j2k/testData/ast/assignmentExpression/expression/xor.kt b/j2k/tests/testData/ast/assignmentExpression/expression/xor.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/expression/xor.kt rename to j2k/tests/testData/ast/assignmentExpression/expression/xor.kt diff --git a/j2k/testData/ast/assignmentExpression/statement/simpleAssignment.jav b/j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav similarity index 100% rename from j2k/testData/ast/assignmentExpression/statement/simpleAssignment.jav rename to j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav diff --git a/j2k/testData/ast/assignmentExpression/statement/simpleAssignment.kt b/j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.kt similarity index 100% rename from j2k/testData/ast/assignmentExpression/statement/simpleAssignment.kt rename to j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.kt diff --git a/j2k/testData/ast/binaryExpression/expression/and.jav b/j2k/tests/testData/ast/binaryExpression/expression/and.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/and.jav rename to j2k/tests/testData/ast/binaryExpression/expression/and.jav diff --git a/j2k/testData/ast/binaryExpression/expression/and.kt b/j2k/tests/testData/ast/binaryExpression/expression/and.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/and.kt rename to j2k/tests/testData/ast/binaryExpression/expression/and.kt diff --git a/j2k/testData/ast/binaryExpression/expression/conditionalAnd.jav b/j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/conditionalAnd.jav rename to j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.jav diff --git a/j2k/testData/ast/binaryExpression/expression/conditionalAnd.kt b/j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/conditionalAnd.kt rename to j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.kt diff --git a/j2k/testData/ast/binaryExpression/expression/conditionalOr.jav b/j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/conditionalOr.jav rename to j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.jav diff --git a/j2k/testData/ast/binaryExpression/expression/conditionalOr.kt b/j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/conditionalOr.kt rename to j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.kt diff --git a/j2k/testData/ast/binaryExpression/expression/divide.jav b/j2k/tests/testData/ast/binaryExpression/expression/divide.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/divide.jav rename to j2k/tests/testData/ast/binaryExpression/expression/divide.jav diff --git a/j2k/testData/ast/binaryExpression/expression/divide.kt b/j2k/tests/testData/ast/binaryExpression/expression/divide.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/divide.kt rename to j2k/tests/testData/ast/binaryExpression/expression/divide.kt diff --git a/j2k/testData/ast/binaryExpression/expression/greaterThan.jav b/j2k/tests/testData/ast/binaryExpression/expression/greaterThan.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/greaterThan.jav rename to j2k/tests/testData/ast/binaryExpression/expression/greaterThan.jav diff --git a/j2k/testData/ast/binaryExpression/expression/greaterThan.kt b/j2k/tests/testData/ast/binaryExpression/expression/greaterThan.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/greaterThan.kt rename to j2k/tests/testData/ast/binaryExpression/expression/greaterThan.kt diff --git a/j2k/testData/ast/binaryExpression/expression/greaterThanEqual.jav b/j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/greaterThanEqual.jav rename to j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.jav diff --git a/j2k/testData/ast/binaryExpression/expression/greaterThanEqual.kt b/j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/greaterThanEqual.kt rename to j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.kt diff --git a/j2k/testData/ast/binaryExpression/expression/lessThan.jav b/j2k/tests/testData/ast/binaryExpression/expression/lessThan.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/lessThan.jav rename to j2k/tests/testData/ast/binaryExpression/expression/lessThan.jav diff --git a/j2k/testData/ast/binaryExpression/expression/lessThan.kt b/j2k/tests/testData/ast/binaryExpression/expression/lessThan.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/lessThan.kt rename to j2k/tests/testData/ast/binaryExpression/expression/lessThan.kt diff --git a/j2k/testData/ast/binaryExpression/expression/lessThanEqual.jav b/j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/lessThanEqual.jav rename to j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.jav diff --git a/j2k/testData/ast/binaryExpression/expression/lessThanEqual.kt b/j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/lessThanEqual.kt rename to j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.kt diff --git a/j2k/testData/ast/binaryExpression/expression/minus.jav b/j2k/tests/testData/ast/binaryExpression/expression/minus.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/minus.jav rename to j2k/tests/testData/ast/binaryExpression/expression/minus.jav diff --git a/j2k/testData/ast/binaryExpression/expression/minus.kt b/j2k/tests/testData/ast/binaryExpression/expression/minus.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/minus.kt rename to j2k/tests/testData/ast/binaryExpression/expression/minus.kt diff --git a/j2k/testData/ast/binaryExpression/expression/multiply.jav b/j2k/tests/testData/ast/binaryExpression/expression/multiply.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/multiply.jav rename to j2k/tests/testData/ast/binaryExpression/expression/multiply.jav diff --git a/j2k/testData/ast/binaryExpression/expression/multiply.kt b/j2k/tests/testData/ast/binaryExpression/expression/multiply.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/multiply.kt rename to j2k/tests/testData/ast/binaryExpression/expression/multiply.kt diff --git a/j2k/testData/ast/binaryExpression/expression/or.jav b/j2k/tests/testData/ast/binaryExpression/expression/or.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/or.jav rename to j2k/tests/testData/ast/binaryExpression/expression/or.jav diff --git a/j2k/testData/ast/binaryExpression/expression/or.kt b/j2k/tests/testData/ast/binaryExpression/expression/or.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/or.kt rename to j2k/tests/testData/ast/binaryExpression/expression/or.kt diff --git a/j2k/testData/ast/binaryExpression/expression/plus.jav b/j2k/tests/testData/ast/binaryExpression/expression/plus.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/plus.jav rename to j2k/tests/testData/ast/binaryExpression/expression/plus.jav diff --git a/j2k/testData/ast/binaryExpression/expression/plus.kt b/j2k/tests/testData/ast/binaryExpression/expression/plus.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/plus.kt rename to j2k/tests/testData/ast/binaryExpression/expression/plus.kt diff --git a/j2k/testData/ast/binaryExpression/expression/remainder.jav b/j2k/tests/testData/ast/binaryExpression/expression/remainder.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/remainder.jav rename to j2k/tests/testData/ast/binaryExpression/expression/remainder.jav diff --git a/j2k/testData/ast/binaryExpression/expression/remainder.kt b/j2k/tests/testData/ast/binaryExpression/expression/remainder.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/remainder.kt rename to j2k/tests/testData/ast/binaryExpression/expression/remainder.kt diff --git a/j2k/testData/ast/binaryExpression/expression/shiftLeft.jav b/j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/shiftLeft.jav rename to j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.jav diff --git a/j2k/testData/ast/binaryExpression/expression/shiftLeft.kt b/j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/shiftLeft.kt rename to j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.kt diff --git a/j2k/testData/ast/binaryExpression/expression/shiftRight.jav b/j2k/tests/testData/ast/binaryExpression/expression/shiftRight.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/shiftRight.jav rename to j2k/tests/testData/ast/binaryExpression/expression/shiftRight.jav diff --git a/j2k/testData/ast/binaryExpression/expression/shiftRight.kt b/j2k/tests/testData/ast/binaryExpression/expression/shiftRight.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/shiftRight.kt rename to j2k/tests/testData/ast/binaryExpression/expression/shiftRight.kt diff --git a/j2k/testData/ast/binaryExpression/expression/unsignedRightShift.jav b/j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/unsignedRightShift.jav rename to j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav diff --git a/j2k/testData/ast/binaryExpression/expression/unsignedRightShift.kt b/j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/unsignedRightShift.kt rename to j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.kt diff --git a/j2k/testData/ast/binaryExpression/expression/xor.jav b/j2k/tests/testData/ast/binaryExpression/expression/xor.jav similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/xor.jav rename to j2k/tests/testData/ast/binaryExpression/expression/xor.jav diff --git a/j2k/testData/ast/binaryExpression/expression/xor.kt b/j2k/tests/testData/ast/binaryExpression/expression/xor.kt similarity index 100% rename from j2k/testData/ast/binaryExpression/expression/xor.kt rename to j2k/tests/testData/ast/binaryExpression/expression/xor.kt diff --git a/j2k/testData/ast/boxedType/file/kt-671.jav b/j2k/tests/testData/ast/boxedType/file/kt-671.jav similarity index 100% rename from j2k/testData/ast/boxedType/file/kt-671.jav rename to j2k/tests/testData/ast/boxedType/file/kt-671.jav diff --git a/j2k/testData/ast/boxedType/file/kt-671.kt b/j2k/tests/testData/ast/boxedType/file/kt-671.kt similarity index 100% rename from j2k/testData/ast/boxedType/file/kt-671.kt rename to j2k/tests/testData/ast/boxedType/file/kt-671.kt diff --git a/j2k/testData/ast/boxedType/statement/boolean.jav b/j2k/tests/testData/ast/boxedType/statement/boolean.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/boolean.jav rename to j2k/tests/testData/ast/boxedType/statement/boolean.jav diff --git a/j2k/testData/ast/boxedType/statement/boolean.kt b/j2k/tests/testData/ast/boxedType/statement/boolean.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/boolean.kt rename to j2k/tests/testData/ast/boxedType/statement/boolean.kt diff --git a/j2k/testData/ast/boxedType/statement/byte.jav b/j2k/tests/testData/ast/boxedType/statement/byte.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/byte.jav rename to j2k/tests/testData/ast/boxedType/statement/byte.jav diff --git a/j2k/testData/ast/boxedType/statement/byte.kt b/j2k/tests/testData/ast/boxedType/statement/byte.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/byte.kt rename to j2k/tests/testData/ast/boxedType/statement/byte.kt diff --git a/j2k/testData/ast/boxedType/statement/character.jav b/j2k/tests/testData/ast/boxedType/statement/character.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/character.jav rename to j2k/tests/testData/ast/boxedType/statement/character.jav diff --git a/j2k/testData/ast/boxedType/statement/character.kt b/j2k/tests/testData/ast/boxedType/statement/character.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/character.kt rename to j2k/tests/testData/ast/boxedType/statement/character.kt diff --git a/j2k/testData/ast/boxedType/statement/double.jav b/j2k/tests/testData/ast/boxedType/statement/double.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/double.jav rename to j2k/tests/testData/ast/boxedType/statement/double.jav diff --git a/j2k/testData/ast/boxedType/statement/double.kt b/j2k/tests/testData/ast/boxedType/statement/double.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/double.kt rename to j2k/tests/testData/ast/boxedType/statement/double.kt diff --git a/j2k/testData/ast/boxedType/statement/float.jav b/j2k/tests/testData/ast/boxedType/statement/float.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/float.jav rename to j2k/tests/testData/ast/boxedType/statement/float.jav diff --git a/j2k/testData/ast/boxedType/statement/float.kt b/j2k/tests/testData/ast/boxedType/statement/float.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/float.kt rename to j2k/tests/testData/ast/boxedType/statement/float.kt diff --git a/j2k/testData/ast/boxedType/statement/integer.jav b/j2k/tests/testData/ast/boxedType/statement/integer.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/integer.jav rename to j2k/tests/testData/ast/boxedType/statement/integer.jav diff --git a/j2k/testData/ast/boxedType/statement/integer.kt b/j2k/tests/testData/ast/boxedType/statement/integer.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/integer.kt rename to j2k/tests/testData/ast/boxedType/statement/integer.kt diff --git a/j2k/testData/ast/boxedType/statement/long.jav b/j2k/tests/testData/ast/boxedType/statement/long.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/long.jav rename to j2k/tests/testData/ast/boxedType/statement/long.jav diff --git a/j2k/testData/ast/boxedType/statement/long.kt b/j2k/tests/testData/ast/boxedType/statement/long.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/long.kt rename to j2k/tests/testData/ast/boxedType/statement/long.kt diff --git a/j2k/testData/ast/boxedType/statement/object.jav b/j2k/tests/testData/ast/boxedType/statement/object.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/object.jav rename to j2k/tests/testData/ast/boxedType/statement/object.jav diff --git a/j2k/testData/ast/boxedType/statement/object.kt b/j2k/tests/testData/ast/boxedType/statement/object.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/object.kt rename to j2k/tests/testData/ast/boxedType/statement/object.kt diff --git a/j2k/testData/ast/boxedType/statement/short.jav b/j2k/tests/testData/ast/boxedType/statement/short.jav similarity index 100% rename from j2k/testData/ast/boxedType/statement/short.jav rename to j2k/tests/testData/ast/boxedType/statement/short.jav diff --git a/j2k/testData/ast/boxedType/statement/short.kt b/j2k/tests/testData/ast/boxedType/statement/short.kt similarity index 100% rename from j2k/testData/ast/boxedType/statement/short.kt rename to j2k/tests/testData/ast/boxedType/statement/short.kt diff --git a/j2k/testData/ast/breakStatement/statement/breakWithLabel.jav b/j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.jav similarity index 100% rename from j2k/testData/ast/breakStatement/statement/breakWithLabel.jav rename to j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.jav diff --git a/j2k/testData/ast/breakStatement/statement/breakWithLabel.kt b/j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.kt similarity index 100% rename from j2k/testData/ast/breakStatement/statement/breakWithLabel.kt rename to j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.kt diff --git a/j2k/testData/ast/breakStatement/statement/breakWithoutLabel.jav b/j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav similarity index 100% rename from j2k/testData/ast/breakStatement/statement/breakWithoutLabel.jav rename to j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav diff --git a/j2k/testData/ast/breakStatement/statement/breakWithoutLabel.kt b/j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.kt similarity index 100% rename from j2k/testData/ast/breakStatement/statement/breakWithoutLabel.kt rename to j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.kt diff --git a/j2k/testData/ast/callChainExpression/file/libraryFieldCall.jav b/j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryFieldCall.jav rename to j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav diff --git a/j2k/testData/ast/callChainExpression/file/libraryFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.kt similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryFieldCall.kt rename to j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.kt diff --git a/j2k/testData/ast/callChainExpression/file/libraryMethodCall.jav b/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryMethodCall.jav rename to j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav diff --git a/j2k/testData/ast/callChainExpression/file/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.kt similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryMethodCall.kt rename to j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.kt diff --git a/j2k/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav b/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav rename to j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav diff --git a/j2k/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt rename to j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt diff --git a/j2k/testData/ast/callChainExpression/file/libraryStringFieldCall.jav b/j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryStringFieldCall.jav rename to j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav diff --git a/j2k/testData/ast/callChainExpression/file/libraryStringFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.kt similarity index 100% rename from j2k/testData/ast/callChainExpression/file/libraryStringFieldCall.kt rename to j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.kt diff --git a/j2k/testData/ast/callChainExpression/statement/sout.jav b/j2k/tests/testData/ast/callChainExpression/statement/sout.jav similarity index 100% rename from j2k/testData/ast/callChainExpression/statement/sout.jav rename to j2k/tests/testData/ast/callChainExpression/statement/sout.jav diff --git a/j2k/testData/ast/callChainExpression/statement/sout.kt b/j2k/tests/testData/ast/callChainExpression/statement/sout.kt similarity index 100% rename from j2k/testData/ast/callChainExpression/statement/sout.kt rename to j2k/tests/testData/ast/callChainExpression/statement/sout.kt diff --git a/j2k/testData/ast/class/class/abstractClass.jav b/j2k/tests/testData/ast/class/class/abstractClass.jav similarity index 100% rename from j2k/testData/ast/class/class/abstractClass.jav rename to j2k/tests/testData/ast/class/class/abstractClass.jav diff --git a/j2k/testData/ast/class/class/abstractClass.kt b/j2k/tests/testData/ast/class/class/abstractClass.kt similarity index 100% rename from j2k/testData/ast/class/class/abstractClass.kt rename to j2k/tests/testData/ast/class/class/abstractClass.kt diff --git a/j2k/testData/ast/class/class/abstractClassShape.jav b/j2k/tests/testData/ast/class/class/abstractClassShape.jav similarity index 100% rename from j2k/testData/ast/class/class/abstractClassShape.jav rename to j2k/tests/testData/ast/class/class/abstractClassShape.jav diff --git a/j2k/testData/ast/class/class/abstractClassShape.kt b/j2k/tests/testData/ast/class/class/abstractClassShape.kt similarity index 100% rename from j2k/testData/ast/class/class/abstractClassShape.kt rename to j2k/tests/testData/ast/class/class/abstractClassShape.kt diff --git a/j2k/testData/ast/class/class/class.jav b/j2k/tests/testData/ast/class/class/class.jav similarity index 100% rename from j2k/testData/ast/class/class/class.jav rename to j2k/tests/testData/ast/class/class/class.jav diff --git a/j2k/testData/ast/class/class/class.kt b/j2k/tests/testData/ast/class/class/class.kt similarity index 100% rename from j2k/testData/ast/class/class/class.kt rename to j2k/tests/testData/ast/class/class/class.kt diff --git a/j2k/testData/ast/class/class/classWithEmptyMethods.jav b/j2k/tests/testData/ast/class/class/classWithEmptyMethods.jav similarity index 100% rename from j2k/testData/ast/class/class/classWithEmptyMethods.jav rename to j2k/tests/testData/ast/class/class/classWithEmptyMethods.jav diff --git a/j2k/testData/ast/class/class/classWithEmptyMethods.kt b/j2k/tests/testData/ast/class/class/classWithEmptyMethods.kt similarity index 100% rename from j2k/testData/ast/class/class/classWithEmptyMethods.kt rename to j2k/tests/testData/ast/class/class/classWithEmptyMethods.kt diff --git a/j2k/testData/ast/class/class/classWithFields.jav b/j2k/tests/testData/ast/class/class/classWithFields.jav similarity index 100% rename from j2k/testData/ast/class/class/classWithFields.jav rename to j2k/tests/testData/ast/class/class/classWithFields.jav diff --git a/j2k/testData/ast/class/class/classWithFields.kt b/j2k/tests/testData/ast/class/class/classWithFields.kt similarity index 100% rename from j2k/testData/ast/class/class/classWithFields.kt rename to j2k/tests/testData/ast/class/class/classWithFields.kt diff --git a/j2k/testData/ast/class/class/classWithMultiplyFields.jav b/j2k/tests/testData/ast/class/class/classWithMultiplyFields.jav similarity index 100% rename from j2k/testData/ast/class/class/classWithMultiplyFields.jav rename to j2k/tests/testData/ast/class/class/classWithMultiplyFields.jav diff --git a/j2k/testData/ast/class/class/classWithMultiplyFields.kt b/j2k/tests/testData/ast/class/class/classWithMultiplyFields.kt similarity index 100% rename from j2k/testData/ast/class/class/classWithMultiplyFields.kt rename to j2k/tests/testData/ast/class/class/classWithMultiplyFields.kt diff --git a/j2k/testData/ast/class/class/emptyClass.jav b/j2k/tests/testData/ast/class/class/emptyClass.jav similarity index 100% rename from j2k/testData/ast/class/class/emptyClass.jav rename to j2k/tests/testData/ast/class/class/emptyClass.jav diff --git a/j2k/testData/ast/class/class/emptyClass.kt b/j2k/tests/testData/ast/class/class/emptyClass.kt similarity index 100% rename from j2k/testData/ast/class/class/emptyClass.kt rename to j2k/tests/testData/ast/class/class/emptyClass.kt diff --git a/j2k/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav b/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav similarity index 100% rename from j2k/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav rename to j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav diff --git a/j2k/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt b/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt similarity index 100% rename from j2k/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt rename to j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt diff --git a/j2k/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav similarity index 100% rename from j2k/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav rename to j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav diff --git a/j2k/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt similarity index 100% rename from j2k/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt rename to j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt diff --git a/j2k/testData/ast/class/class/finalClass.jav b/j2k/tests/testData/ast/class/class/finalClass.jav similarity index 100% rename from j2k/testData/ast/class/class/finalClass.jav rename to j2k/tests/testData/ast/class/class/finalClass.jav diff --git a/j2k/testData/ast/class/class/finalClass.kt b/j2k/tests/testData/ast/class/class/finalClass.kt similarity index 100% rename from j2k/testData/ast/class/class/finalClass.kt rename to j2k/tests/testData/ast/class/class/finalClass.kt diff --git a/j2k/testData/ast/class/class/genericClass.jav b/j2k/tests/testData/ast/class/class/genericClass.jav similarity index 100% rename from j2k/testData/ast/class/class/genericClass.jav rename to j2k/tests/testData/ast/class/class/genericClass.jav diff --git a/j2k/testData/ast/class/class/genericClass.kt b/j2k/tests/testData/ast/class/class/genericClass.kt similarity index 100% rename from j2k/testData/ast/class/class/genericClass.kt rename to j2k/tests/testData/ast/class/class/genericClass.kt diff --git a/j2k/testData/ast/class/class/innerEmptyClass.jav b/j2k/tests/testData/ast/class/class/innerEmptyClass.jav similarity index 100% rename from j2k/testData/ast/class/class/innerEmptyClass.jav rename to j2k/tests/testData/ast/class/class/innerEmptyClass.jav diff --git a/j2k/testData/ast/class/class/innerEmptyClass.kt b/j2k/tests/testData/ast/class/class/innerEmptyClass.kt similarity index 100% rename from j2k/testData/ast/class/class/innerEmptyClass.kt rename to j2k/tests/testData/ast/class/class/innerEmptyClass.kt diff --git a/j2k/testData/ast/class/class/innerStaticClass.jav b/j2k/tests/testData/ast/class/class/innerStaticClass.jav similarity index 100% rename from j2k/testData/ast/class/class/innerStaticClass.jav rename to j2k/tests/testData/ast/class/class/innerStaticClass.jav diff --git a/j2k/testData/ast/class/class/innerStaticClass.kt b/j2k/tests/testData/ast/class/class/innerStaticClass.kt similarity index 100% rename from j2k/testData/ast/class/class/innerStaticClass.kt rename to j2k/tests/testData/ast/class/class/innerStaticClass.kt diff --git a/j2k/testData/ast/class/class/internalClass.jav b/j2k/tests/testData/ast/class/class/internalClass.jav similarity index 100% rename from j2k/testData/ast/class/class/internalClass.jav rename to j2k/tests/testData/ast/class/class/internalClass.jav diff --git a/j2k/testData/ast/class/class/internalClass.kt b/j2k/tests/testData/ast/class/class/internalClass.kt similarity index 100% rename from j2k/testData/ast/class/class/internalClass.kt rename to j2k/tests/testData/ast/class/class/internalClass.kt diff --git a/j2k/testData/ast/class/class/oneStaticFieldOneNonStatic.jav b/j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav similarity index 100% rename from j2k/testData/ast/class/class/oneStaticFieldOneNonStatic.jav rename to j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav diff --git a/j2k/testData/ast/class/class/oneStaticFieldOneNonStatic.kt b/j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.kt similarity index 100% rename from j2k/testData/ast/class/class/oneStaticFieldOneNonStatic.kt rename to j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.kt diff --git a/j2k/testData/ast/class/class/oneStaticMethod.jav b/j2k/tests/testData/ast/class/class/oneStaticMethod.jav similarity index 100% rename from j2k/testData/ast/class/class/oneStaticMethod.jav rename to j2k/tests/testData/ast/class/class/oneStaticMethod.jav diff --git a/j2k/testData/ast/class/class/oneStaticMethod.kt b/j2k/tests/testData/ast/class/class/oneStaticMethod.kt similarity index 100% rename from j2k/testData/ast/class/class/oneStaticMethod.kt rename to j2k/tests/testData/ast/class/class/oneStaticMethod.kt diff --git a/j2k/testData/ast/class/class/oneStaticMethodOneNonStatic.jav b/j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav similarity index 100% rename from j2k/testData/ast/class/class/oneStaticMethodOneNonStatic.jav rename to j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav diff --git a/j2k/testData/ast/class/class/oneStaticMethodOneNonStatic.kt b/j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.kt similarity index 100% rename from j2k/testData/ast/class/class/oneStaticMethodOneNonStatic.kt rename to j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.kt diff --git a/j2k/testData/ast/class/class/pivateClass.jav b/j2k/tests/testData/ast/class/class/pivateClass.jav similarity index 100% rename from j2k/testData/ast/class/class/pivateClass.jav rename to j2k/tests/testData/ast/class/class/pivateClass.jav diff --git a/j2k/testData/ast/class/class/pivateClass.kt b/j2k/tests/testData/ast/class/class/pivateClass.kt similarity index 100% rename from j2k/testData/ast/class/class/pivateClass.kt rename to j2k/tests/testData/ast/class/class/pivateClass.kt diff --git a/j2k/testData/ast/class/class/protectedClass.jav b/j2k/tests/testData/ast/class/class/protectedClass.jav similarity index 100% rename from j2k/testData/ast/class/class/protectedClass.jav rename to j2k/tests/testData/ast/class/class/protectedClass.jav diff --git a/j2k/testData/ast/class/class/protectedClass.kt b/j2k/tests/testData/ast/class/class/protectedClass.kt similarity index 100% rename from j2k/testData/ast/class/class/protectedClass.kt rename to j2k/tests/testData/ast/class/class/protectedClass.kt diff --git a/j2k/testData/ast/class/class/publicClass.jav b/j2k/tests/testData/ast/class/class/publicClass.jav similarity index 100% rename from j2k/testData/ast/class/class/publicClass.jav rename to j2k/tests/testData/ast/class/class/publicClass.jav diff --git a/j2k/testData/ast/class/class/publicClass.kt b/j2k/tests/testData/ast/class/class/publicClass.kt similarity index 100% rename from j2k/testData/ast/class/class/publicClass.kt rename to j2k/tests/testData/ast/class/class/publicClass.kt diff --git a/j2k/testData/ast/class/class/simpleInheritance.jav b/j2k/tests/testData/ast/class/class/simpleInheritance.jav similarity index 100% rename from j2k/testData/ast/class/class/simpleInheritance.jav rename to j2k/tests/testData/ast/class/class/simpleInheritance.jav diff --git a/j2k/testData/ast/class/class/simpleInheritance.kt b/j2k/tests/testData/ast/class/class/simpleInheritance.kt similarity index 100% rename from j2k/testData/ast/class/class/simpleInheritance.kt rename to j2k/tests/testData/ast/class/class/simpleInheritance.kt diff --git a/j2k/testData/ast/class/class/twoStaticMethod.jav b/j2k/tests/testData/ast/class/class/twoStaticMethod.jav similarity index 100% rename from j2k/testData/ast/class/class/twoStaticMethod.jav rename to j2k/tests/testData/ast/class/class/twoStaticMethod.jav diff --git a/j2k/testData/ast/class/class/twoStaticMethod.kt b/j2k/tests/testData/ast/class/class/twoStaticMethod.kt similarity index 100% rename from j2k/testData/ast/class/class/twoStaticMethod.kt rename to j2k/tests/testData/ast/class/class/twoStaticMethod.kt diff --git a/j2k/testData/ast/class/file/kt-639.jav b/j2k/tests/testData/ast/class/file/kt-639.jav similarity index 100% rename from j2k/testData/ast/class/file/kt-639.jav rename to j2k/tests/testData/ast/class/file/kt-639.jav diff --git a/j2k/testData/ast/class/file/kt-639.kt b/j2k/tests/testData/ast/class/file/kt-639.kt similarity index 100% rename from j2k/testData/ast/class/file/kt-639.kt rename to j2k/tests/testData/ast/class/file/kt-639.kt diff --git a/j2k/testData/ast/class/file/privateInit.jav b/j2k/tests/testData/ast/class/file/privateInit.jav similarity index 100% rename from j2k/testData/ast/class/file/privateInit.jav rename to j2k/tests/testData/ast/class/file/privateInit.jav diff --git a/j2k/testData/ast/class/file/privateInit.kt b/j2k/tests/testData/ast/class/file/privateInit.kt similarity index 100% rename from j2k/testData/ast/class/file/privateInit.kt rename to j2k/tests/testData/ast/class/file/privateInit.kt diff --git a/j2k/testData/ast/classExpression/expression/objectClass.jav b/j2k/tests/testData/ast/classExpression/expression/objectClass.jav similarity index 100% rename from j2k/testData/ast/classExpression/expression/objectClass.jav rename to j2k/tests/testData/ast/classExpression/expression/objectClass.jav diff --git a/j2k/testData/ast/classExpression/expression/objectClass.kt b/j2k/tests/testData/ast/classExpression/expression/objectClass.kt similarity index 100% rename from j2k/testData/ast/classExpression/expression/objectClass.kt rename to j2k/tests/testData/ast/classExpression/expression/objectClass.kt diff --git a/j2k/testData/ast/classExpression/expression/stringClass.jav b/j2k/tests/testData/ast/classExpression/expression/stringClass.jav similarity index 100% rename from j2k/testData/ast/classExpression/expression/stringClass.jav rename to j2k/tests/testData/ast/classExpression/expression/stringClass.jav diff --git a/j2k/testData/ast/classExpression/expression/stringClass.kt b/j2k/tests/testData/ast/classExpression/expression/stringClass.kt similarity index 100% rename from j2k/testData/ast/classExpression/expression/stringClass.kt rename to j2k/tests/testData/ast/classExpression/expression/stringClass.kt diff --git a/j2k/testData/ast/classExpression/statement/complexExample.jav b/j2k/tests/testData/ast/classExpression/statement/complexExample.jav similarity index 100% rename from j2k/testData/ast/classExpression/statement/complexExample.jav rename to j2k/tests/testData/ast/classExpression/statement/complexExample.jav diff --git a/j2k/testData/ast/classExpression/statement/complexExample.kt b/j2k/tests/testData/ast/classExpression/statement/complexExample.kt similarity index 100% rename from j2k/testData/ast/classExpression/statement/complexExample.kt rename to j2k/tests/testData/ast/classExpression/statement/complexExample.kt diff --git a/j2k/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav b/j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav similarity index 100% rename from j2k/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav rename to j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav diff --git a/j2k/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt b/j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt similarity index 100% rename from j2k/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt rename to j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt diff --git a/j2k/testData/ast/constructors/file/allCallsPrimary.jav b/j2k/tests/testData/ast/constructors/file/allCallsPrimary.jav similarity index 100% rename from j2k/testData/ast/constructors/file/allCallsPrimary.jav rename to j2k/tests/testData/ast/constructors/file/allCallsPrimary.jav diff --git a/j2k/testData/ast/constructors/file/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt similarity index 100% rename from j2k/testData/ast/constructors/file/allCallsPrimary.kt rename to j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt diff --git a/j2k/testData/ast/constructors/file/allCallsPrimary2.jav b/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.jav similarity index 100% rename from j2k/testData/ast/constructors/file/allCallsPrimary2.jav rename to j2k/tests/testData/ast/constructors/file/allCallsPrimary2.jav diff --git a/j2k/testData/ast/constructors/file/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt similarity index 100% rename from j2k/testData/ast/constructors/file/allCallsPrimary2.kt rename to j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt diff --git a/j2k/testData/ast/constructors/file/customerBuilder.jav b/j2k/tests/testData/ast/constructors/file/customerBuilder.jav similarity index 100% rename from j2k/testData/ast/constructors/file/customerBuilder.jav rename to j2k/tests/testData/ast/constructors/file/customerBuilder.jav diff --git a/j2k/testData/ast/constructors/file/customerBuilder.kt b/j2k/tests/testData/ast/constructors/file/customerBuilder.kt similarity index 100% rename from j2k/testData/ast/constructors/file/customerBuilder.kt rename to j2k/tests/testData/ast/constructors/file/customerBuilder.kt diff --git a/j2k/testData/ast/constructors/file/genericIdentifier.jav b/j2k/tests/testData/ast/constructors/file/genericIdentifier.jav similarity index 100% rename from j2k/testData/ast/constructors/file/genericIdentifier.jav rename to j2k/tests/testData/ast/constructors/file/genericIdentifier.jav diff --git a/j2k/testData/ast/constructors/file/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt similarity index 100% rename from j2k/testData/ast/constructors/file/genericIdentifier.kt rename to j2k/tests/testData/ast/constructors/file/genericIdentifier.kt diff --git a/j2k/testData/ast/constructors/file/identifier.jav b/j2k/tests/testData/ast/constructors/file/identifier.jav similarity index 100% rename from j2k/testData/ast/constructors/file/identifier.jav rename to j2k/tests/testData/ast/constructors/file/identifier.jav diff --git a/j2k/testData/ast/constructors/file/identifier.kt b/j2k/tests/testData/ast/constructors/file/identifier.kt similarity index 100% rename from j2k/testData/ast/constructors/file/identifier.kt rename to j2k/tests/testData/ast/constructors/file/identifier.kt diff --git a/j2k/testData/ast/constructors/file/withManyDefaultParams.jav b/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.jav similarity index 100% rename from j2k/testData/ast/constructors/file/withManyDefaultParams.jav rename to j2k/tests/testData/ast/constructors/file/withManyDefaultParams.jav diff --git a/j2k/testData/ast/constructors/file/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt similarity index 100% rename from j2k/testData/ast/constructors/file/withManyDefaultParams.kt rename to j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt diff --git a/j2k/testData/ast/continueStatement/statement/continueWithLabel.jav b/j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.jav similarity index 100% rename from j2k/testData/ast/continueStatement/statement/continueWithLabel.jav rename to j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.jav diff --git a/j2k/testData/ast/continueStatement/statement/continueWithLabel.kt b/j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.kt similarity index 100% rename from j2k/testData/ast/continueStatement/statement/continueWithLabel.kt rename to j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.kt diff --git a/j2k/testData/ast/continueStatement/statement/continueWithoutLabel.jav b/j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav similarity index 100% rename from j2k/testData/ast/continueStatement/statement/continueWithoutLabel.jav rename to j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav diff --git a/j2k/testData/ast/continueStatement/statement/continueWithoutLabel.kt b/j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.kt similarity index 100% rename from j2k/testData/ast/continueStatement/statement/continueWithoutLabel.kt rename to j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.kt diff --git a/j2k/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav rename to j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav diff --git a/j2k/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt rename to j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt diff --git a/j2k/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav rename to j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav diff --git a/j2k/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt rename to j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt diff --git a/j2k/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav rename to j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav diff --git a/j2k/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt rename to j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt diff --git a/j2k/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav rename to j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav diff --git a/j2k/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt rename to j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt diff --git a/j2k/testData/ast/declarationStatement/statement/singleIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleIntDeclaration.jav rename to j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav diff --git a/j2k/testData/ast/declarationStatement/statement/singleIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.kt similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleIntDeclaration.kt rename to j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.kt diff --git a/j2k/testData/ast/declarationStatement/statement/singleStringDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleStringDeclaration.jav rename to j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav diff --git a/j2k/testData/ast/declarationStatement/statement/singleStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.kt similarity index 100% rename from j2k/testData/ast/declarationStatement/statement/singleStringDeclaration.kt rename to j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.kt diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithBlock.jav b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithBlock.jav rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithBlock.kt b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.kt similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithBlock.kt rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.kt diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithExpression.jav b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithExpression.jav rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithExpression.kt b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.kt similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithExpression.kt rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.kt diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithReturn.jav b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithReturn.jav rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav diff --git a/j2k/testData/ast/doWhileStatement/statement/whileWithReturn.kt b/j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.kt similarity index 100% rename from j2k/testData/ast/doWhileStatement/statement/whileWithReturn.kt rename to j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.kt diff --git a/j2k/testData/ast/enum/class/colorEnum.jav b/j2k/tests/testData/ast/enum/class/colorEnum.jav similarity index 100% rename from j2k/testData/ast/enum/class/colorEnum.jav rename to j2k/tests/testData/ast/enum/class/colorEnum.jav diff --git a/j2k/testData/ast/enum/class/colorEnum.kt b/j2k/tests/testData/ast/enum/class/colorEnum.kt similarity index 100% rename from j2k/testData/ast/enum/class/colorEnum.kt rename to j2k/tests/testData/ast/enum/class/colorEnum.kt diff --git a/j2k/testData/ast/enum/class/emptyEnum.jav b/j2k/tests/testData/ast/enum/class/emptyEnum.jav similarity index 100% rename from j2k/testData/ast/enum/class/emptyEnum.jav rename to j2k/tests/testData/ast/enum/class/emptyEnum.jav diff --git a/j2k/testData/ast/enum/class/emptyEnum.kt b/j2k/tests/testData/ast/enum/class/emptyEnum.kt similarity index 100% rename from j2k/testData/ast/enum/class/emptyEnum.kt rename to j2k/tests/testData/ast/enum/class/emptyEnum.kt diff --git a/j2k/testData/ast/enum/class/enumImplementsOneInterface.jav b/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.jav similarity index 100% rename from j2k/testData/ast/enum/class/enumImplementsOneInterface.jav rename to j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.jav diff --git a/j2k/testData/ast/enum/class/enumImplementsOneInterface.kt b/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt similarity index 100% rename from j2k/testData/ast/enum/class/enumImplementsOneInterface.kt rename to j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt diff --git a/j2k/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav b/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav similarity index 100% rename from j2k/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav rename to j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav diff --git a/j2k/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt similarity index 100% rename from j2k/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt rename to j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt diff --git a/j2k/testData/ast/enum/class/enumWithNameField.jav b/j2k/tests/testData/ast/enum/class/enumWithNameField.jav similarity index 100% rename from j2k/testData/ast/enum/class/enumWithNameField.jav rename to j2k/tests/testData/ast/enum/class/enumWithNameField.jav diff --git a/j2k/testData/ast/enum/class/enumWithNameField.kt b/j2k/tests/testData/ast/enum/class/enumWithNameField.kt similarity index 100% rename from j2k/testData/ast/enum/class/enumWithNameField.kt rename to j2k/tests/testData/ast/enum/class/enumWithNameField.kt diff --git a/j2k/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav b/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav similarity index 100% rename from j2k/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav rename to j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav diff --git a/j2k/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt similarity index 100% rename from j2k/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt rename to j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt diff --git a/j2k/testData/ast/enum/class/internalEnum.jav b/j2k/tests/testData/ast/enum/class/internalEnum.jav similarity index 100% rename from j2k/testData/ast/enum/class/internalEnum.jav rename to j2k/tests/testData/ast/enum/class/internalEnum.jav diff --git a/j2k/testData/ast/enum/class/internalEnum.kt b/j2k/tests/testData/ast/enum/class/internalEnum.kt similarity index 100% rename from j2k/testData/ast/enum/class/internalEnum.kt rename to j2k/tests/testData/ast/enum/class/internalEnum.kt diff --git a/j2k/testData/ast/enum/class/overrideToString.jav b/j2k/tests/testData/ast/enum/class/overrideToString.jav similarity index 100% rename from j2k/testData/ast/enum/class/overrideToString.jav rename to j2k/tests/testData/ast/enum/class/overrideToString.jav diff --git a/j2k/testData/ast/enum/class/overrideToString.kt b/j2k/tests/testData/ast/enum/class/overrideToString.kt similarity index 100% rename from j2k/testData/ast/enum/class/overrideToString.kt rename to j2k/tests/testData/ast/enum/class/overrideToString.kt diff --git a/j2k/testData/ast/enum/class/primaryPrivateConstructor.jav b/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.jav similarity index 100% rename from j2k/testData/ast/enum/class/primaryPrivateConstructor.jav rename to j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.jav diff --git a/j2k/testData/ast/enum/class/primaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt similarity index 100% rename from j2k/testData/ast/enum/class/primaryPrivateConstructor.kt rename to j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt diff --git a/j2k/testData/ast/enum/class/privateEnum.jav b/j2k/tests/testData/ast/enum/class/privateEnum.jav similarity index 100% rename from j2k/testData/ast/enum/class/privateEnum.jav rename to j2k/tests/testData/ast/enum/class/privateEnum.jav diff --git a/j2k/testData/ast/enum/class/privateEnum.kt b/j2k/tests/testData/ast/enum/class/privateEnum.kt similarity index 100% rename from j2k/testData/ast/enum/class/privateEnum.kt rename to j2k/tests/testData/ast/enum/class/privateEnum.kt diff --git a/j2k/testData/ast/enum/class/protectedEnum.jav b/j2k/tests/testData/ast/enum/class/protectedEnum.jav similarity index 100% rename from j2k/testData/ast/enum/class/protectedEnum.jav rename to j2k/tests/testData/ast/enum/class/protectedEnum.jav diff --git a/j2k/testData/ast/enum/class/protectedEnum.kt b/j2k/tests/testData/ast/enum/class/protectedEnum.kt similarity index 100% rename from j2k/testData/ast/enum/class/protectedEnum.kt rename to j2k/tests/testData/ast/enum/class/protectedEnum.kt diff --git a/j2k/testData/ast/enum/class/publicEnum.jav b/j2k/tests/testData/ast/enum/class/publicEnum.jav similarity index 100% rename from j2k/testData/ast/enum/class/publicEnum.jav rename to j2k/tests/testData/ast/enum/class/publicEnum.jav diff --git a/j2k/testData/ast/enum/class/publicEnum.kt b/j2k/tests/testData/ast/enum/class/publicEnum.kt similarity index 100% rename from j2k/testData/ast/enum/class/publicEnum.kt rename to j2k/tests/testData/ast/enum/class/publicEnum.kt diff --git a/j2k/testData/ast/enum/class/runnableImplementation.jav b/j2k/tests/testData/ast/enum/class/runnableImplementation.jav similarity index 100% rename from j2k/testData/ast/enum/class/runnableImplementation.jav rename to j2k/tests/testData/ast/enum/class/runnableImplementation.jav diff --git a/j2k/testData/ast/enum/class/runnableImplementation.kt b/j2k/tests/testData/ast/enum/class/runnableImplementation.kt similarity index 100% rename from j2k/testData/ast/enum/class/runnableImplementation.kt rename to j2k/tests/testData/ast/enum/class/runnableImplementation.kt diff --git a/j2k/testData/ast/enum/class/typeSafeEnum.jav b/j2k/tests/testData/ast/enum/class/typeSafeEnum.jav similarity index 100% rename from j2k/testData/ast/enum/class/typeSafeEnum.jav rename to j2k/tests/testData/ast/enum/class/typeSafeEnum.jav diff --git a/j2k/testData/ast/enum/class/typeSafeEnum.kt b/j2k/tests/testData/ast/enum/class/typeSafeEnum.kt similarity index 100% rename from j2k/testData/ast/enum/class/typeSafeEnum.kt rename to j2k/tests/testData/ast/enum/class/typeSafeEnum.kt diff --git a/j2k/testData/ast/field/file/classChildExtendsBase.jav b/j2k/tests/testData/ast/field/file/classChildExtendsBase.jav similarity index 100% rename from j2k/testData/ast/field/file/classChildExtendsBase.jav rename to j2k/tests/testData/ast/field/file/classChildExtendsBase.jav diff --git a/j2k/testData/ast/field/file/classChildExtendsBase.kt b/j2k/tests/testData/ast/field/file/classChildExtendsBase.kt similarity index 100% rename from j2k/testData/ast/field/file/classChildExtendsBase.kt rename to j2k/tests/testData/ast/field/file/classChildExtendsBase.kt diff --git a/j2k/testData/ast/field/file/internalField.jav b/j2k/tests/testData/ast/field/file/internalField.jav similarity index 100% rename from j2k/testData/ast/field/file/internalField.jav rename to j2k/tests/testData/ast/field/file/internalField.jav diff --git a/j2k/testData/ast/field/file/internalField.kt b/j2k/tests/testData/ast/field/file/internalField.kt similarity index 100% rename from j2k/testData/ast/field/file/internalField.kt rename to j2k/tests/testData/ast/field/file/internalField.kt diff --git a/j2k/testData/ast/field/file/privateField.jav b/j2k/tests/testData/ast/field/file/privateField.jav similarity index 100% rename from j2k/testData/ast/field/file/privateField.jav rename to j2k/tests/testData/ast/field/file/privateField.jav diff --git a/j2k/testData/ast/field/file/privateField.kt b/j2k/tests/testData/ast/field/file/privateField.kt similarity index 100% rename from j2k/testData/ast/field/file/privateField.kt rename to j2k/tests/testData/ast/field/file/privateField.kt diff --git a/j2k/testData/ast/field/file/protectedField.jav b/j2k/tests/testData/ast/field/file/protectedField.jav similarity index 100% rename from j2k/testData/ast/field/file/protectedField.jav rename to j2k/tests/testData/ast/field/file/protectedField.jav diff --git a/j2k/testData/ast/field/file/protectedField.kt b/j2k/tests/testData/ast/field/file/protectedField.kt similarity index 100% rename from j2k/testData/ast/field/file/protectedField.kt rename to j2k/tests/testData/ast/field/file/protectedField.kt diff --git a/j2k/testData/ast/field/file/publicField.jav b/j2k/tests/testData/ast/field/file/publicField.jav similarity index 100% rename from j2k/testData/ast/field/file/publicField.jav rename to j2k/tests/testData/ast/field/file/publicField.jav diff --git a/j2k/testData/ast/field/file/publicField.kt b/j2k/tests/testData/ast/field/file/publicField.kt similarity index 100% rename from j2k/testData/ast/field/file/publicField.kt rename to j2k/tests/testData/ast/field/file/publicField.kt diff --git a/j2k/testData/ast/field/file/valWithInit.jav b/j2k/tests/testData/ast/field/file/valWithInit.jav similarity index 100% rename from j2k/testData/ast/field/file/valWithInit.jav rename to j2k/tests/testData/ast/field/file/valWithInit.jav diff --git a/j2k/testData/ast/field/file/valWithInit.kt b/j2k/tests/testData/ast/field/file/valWithInit.kt similarity index 100% rename from j2k/testData/ast/field/file/valWithInit.kt rename to j2k/tests/testData/ast/field/file/valWithInit.kt diff --git a/j2k/testData/ast/field/file/varWithInit.jav b/j2k/tests/testData/ast/field/file/varWithInit.jav similarity index 100% rename from j2k/testData/ast/field/file/varWithInit.jav rename to j2k/tests/testData/ast/field/file/varWithInit.jav diff --git a/j2k/testData/ast/field/file/varWithInit.kt b/j2k/tests/testData/ast/field/file/varWithInit.kt similarity index 100% rename from j2k/testData/ast/field/file/varWithInit.kt rename to j2k/tests/testData/ast/field/file/varWithInit.kt diff --git a/j2k/testData/ast/field/file/varWithoutInit.jav b/j2k/tests/testData/ast/field/file/varWithoutInit.jav similarity index 100% rename from j2k/testData/ast/field/file/varWithoutInit.jav rename to j2k/tests/testData/ast/field/file/varWithoutInit.jav diff --git a/j2k/testData/ast/field/file/varWithoutInit.kt b/j2k/tests/testData/ast/field/file/varWithoutInit.kt similarity index 100% rename from j2k/testData/ast/field/file/varWithoutInit.kt rename to j2k/tests/testData/ast/field/file/varWithoutInit.kt diff --git a/j2k/testData/ast/file/comp/intNullability.jav b/j2k/tests/testData/ast/file/comp/intNullability.jav similarity index 100% rename from j2k/testData/ast/file/comp/intNullability.jav rename to j2k/tests/testData/ast/file/comp/intNullability.jav diff --git a/j2k/testData/ast/file/comp/intNullability.kt b/j2k/tests/testData/ast/file/comp/intNullability.kt similarity index 100% rename from j2k/testData/ast/file/comp/intNullability.kt rename to j2k/tests/testData/ast/file/comp/intNullability.kt diff --git a/j2k/testData/ast/file/file/packageWithClass.jav b/j2k/tests/testData/ast/file/file/packageWithClass.jav similarity index 100% rename from j2k/testData/ast/file/file/packageWithClass.jav rename to j2k/tests/testData/ast/file/file/packageWithClass.jav diff --git a/j2k/testData/ast/file/file/packageWithClass.kt b/j2k/tests/testData/ast/file/file/packageWithClass.kt similarity index 100% rename from j2k/testData/ast/file/file/packageWithClass.kt rename to j2k/tests/testData/ast/file/file/packageWithClass.kt diff --git a/j2k/testData/ast/file/file/packageWithClasses.jav b/j2k/tests/testData/ast/file/file/packageWithClasses.jav similarity index 100% rename from j2k/testData/ast/file/file/packageWithClasses.jav rename to j2k/tests/testData/ast/file/file/packageWithClasses.jav diff --git a/j2k/testData/ast/file/file/packageWithClasses.kt b/j2k/tests/testData/ast/file/file/packageWithClasses.kt similarity index 100% rename from j2k/testData/ast/file/file/packageWithClasses.kt rename to j2k/tests/testData/ast/file/file/packageWithClasses.kt diff --git a/j2k/testData/ast/file/file/packageWithImports.jav b/j2k/tests/testData/ast/file/file/packageWithImports.jav similarity index 100% rename from j2k/testData/ast/file/file/packageWithImports.jav rename to j2k/tests/testData/ast/file/file/packageWithImports.jav diff --git a/j2k/testData/ast/file/file/packageWithImports.kt b/j2k/tests/testData/ast/file/file/packageWithImports.kt similarity index 100% rename from j2k/testData/ast/file/file/packageWithImports.kt rename to j2k/tests/testData/ast/file/file/packageWithImports.kt diff --git a/j2k/testData/ast/file/file/packageWithMixedImports.jav b/j2k/tests/testData/ast/file/file/packageWithMixedImports.jav similarity index 100% rename from j2k/testData/ast/file/file/packageWithMixedImports.jav rename to j2k/tests/testData/ast/file/file/packageWithMixedImports.jav diff --git a/j2k/testData/ast/file/file/packageWithMixedImports.kt b/j2k/tests/testData/ast/file/file/packageWithMixedImports.kt similarity index 100% rename from j2k/testData/ast/file/file/packageWithMixedImports.kt rename to j2k/tests/testData/ast/file/file/packageWithMixedImports.kt diff --git a/j2k/testData/ast/file/file/packageWithOpenClass.jav b/j2k/tests/testData/ast/file/file/packageWithOpenClass.jav similarity index 100% rename from j2k/testData/ast/file/file/packageWithOpenClass.jav rename to j2k/tests/testData/ast/file/file/packageWithOpenClass.jav diff --git a/j2k/testData/ast/file/file/packageWithOpenClass.kt b/j2k/tests/testData/ast/file/file/packageWithOpenClass.kt similarity index 100% rename from j2k/testData/ast/file/file/packageWithOpenClass.kt rename to j2k/tests/testData/ast/file/file/packageWithOpenClass.kt diff --git a/j2k/testData/ast/file/file/packageWithStaticImports.jav b/j2k/tests/testData/ast/file/file/packageWithStaticImports.jav similarity index 100% rename from j2k/testData/ast/file/file/packageWithStaticImports.jav rename to j2k/tests/testData/ast/file/file/packageWithStaticImports.jav diff --git a/j2k/testData/ast/file/file/packageWithStaticImports.kt b/j2k/tests/testData/ast/file/file/packageWithStaticImports.kt similarity index 100% rename from j2k/testData/ast/file/file/packageWithStaticImports.kt rename to j2k/tests/testData/ast/file/file/packageWithStaticImports.kt diff --git a/j2k/testData/ast/for/statement/commonCaseForTest.jav b/j2k/tests/testData/ast/for/statement/commonCaseForTest.jav similarity index 100% rename from j2k/testData/ast/for/statement/commonCaseForTest.jav rename to j2k/tests/testData/ast/for/statement/commonCaseForTest.jav diff --git a/j2k/testData/ast/for/statement/commonCaseForTest.kt b/j2k/tests/testData/ast/for/statement/commonCaseForTest.kt similarity index 100% rename from j2k/testData/ast/for/statement/commonCaseForTest.kt rename to j2k/tests/testData/ast/for/statement/commonCaseForTest.kt diff --git a/j2k/testData/ast/for/statement/forRangeWithLE.jav b/j2k/tests/testData/ast/for/statement/forRangeWithLE.jav similarity index 100% rename from j2k/testData/ast/for/statement/forRangeWithLE.jav rename to j2k/tests/testData/ast/for/statement/forRangeWithLE.jav diff --git a/j2k/testData/ast/for/statement/forRangeWithLE.kt b/j2k/tests/testData/ast/for/statement/forRangeWithLE.kt similarity index 100% rename from j2k/testData/ast/for/statement/forRangeWithLE.kt rename to j2k/tests/testData/ast/for/statement/forRangeWithLE.kt diff --git a/j2k/testData/ast/for/statement/forRangeWithLT.jav b/j2k/tests/testData/ast/for/statement/forRangeWithLT.jav similarity index 100% rename from j2k/testData/ast/for/statement/forRangeWithLT.jav rename to j2k/tests/testData/ast/for/statement/forRangeWithLT.jav diff --git a/j2k/testData/ast/for/statement/forRangeWithLT.kt b/j2k/tests/testData/ast/for/statement/forRangeWithLT.kt similarity index 100% rename from j2k/testData/ast/for/statement/forRangeWithLT.kt rename to j2k/tests/testData/ast/for/statement/forRangeWithLT.kt diff --git a/j2k/testData/ast/for/statement/forWithBlock.jav b/j2k/tests/testData/ast/for/statement/forWithBlock.jav similarity index 100% rename from j2k/testData/ast/for/statement/forWithBlock.jav rename to j2k/tests/testData/ast/for/statement/forWithBlock.jav diff --git a/j2k/testData/ast/for/statement/forWithBlock.kt b/j2k/tests/testData/ast/for/statement/forWithBlock.kt similarity index 100% rename from j2k/testData/ast/for/statement/forWithBlock.kt rename to j2k/tests/testData/ast/for/statement/forWithBlock.kt diff --git a/j2k/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav b/j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav similarity index 100% rename from j2k/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav rename to j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav diff --git a/j2k/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt b/j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt similarity index 100% rename from j2k/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt rename to j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt diff --git a/j2k/testData/ast/for/statement/forWithEmptyBlock.jav b/j2k/tests/testData/ast/for/statement/forWithEmptyBlock.jav similarity index 100% rename from j2k/testData/ast/for/statement/forWithEmptyBlock.jav rename to j2k/tests/testData/ast/for/statement/forWithEmptyBlock.jav diff --git a/j2k/testData/ast/for/statement/forWithEmptyBlock.kt b/j2k/tests/testData/ast/for/statement/forWithEmptyBlock.kt similarity index 100% rename from j2k/testData/ast/for/statement/forWithEmptyBlock.kt rename to j2k/tests/testData/ast/for/statement/forWithEmptyBlock.kt diff --git a/j2k/testData/ast/for/statement/forWithExpression.jav b/j2k/tests/testData/ast/for/statement/forWithExpression.jav similarity index 100% rename from j2k/testData/ast/for/statement/forWithExpression.jav rename to j2k/tests/testData/ast/for/statement/forWithExpression.jav diff --git a/j2k/testData/ast/for/statement/forWithExpression.kt b/j2k/tests/testData/ast/for/statement/forWithExpression.kt similarity index 100% rename from j2k/testData/ast/for/statement/forWithExpression.kt rename to j2k/tests/testData/ast/for/statement/forWithExpression.kt diff --git a/j2k/testData/ast/for/statement/forWithReturn.jav b/j2k/tests/testData/ast/for/statement/forWithReturn.jav similarity index 100% rename from j2k/testData/ast/for/statement/forWithReturn.jav rename to j2k/tests/testData/ast/for/statement/forWithReturn.jav diff --git a/j2k/testData/ast/for/statement/forWithReturn.kt b/j2k/tests/testData/ast/for/statement/forWithReturn.kt similarity index 100% rename from j2k/testData/ast/for/statement/forWithReturn.kt rename to j2k/tests/testData/ast/for/statement/forWithReturn.kt diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav diff --git a/j2k/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt similarity index 100% rename from j2k/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt rename to j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt diff --git a/j2k/testData/ast/function/file/extendsBaseWhichExtendsObject.jav b/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav similarity index 100% rename from j2k/testData/ast/function/file/extendsBaseWhichExtendsObject.jav rename to j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav diff --git a/j2k/testData/ast/function/file/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt similarity index 100% rename from j2k/testData/ast/function/file/extendsBaseWhichExtendsObject.kt rename to j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt diff --git a/j2k/testData/ast/function/file/functionInFinalClass.jav b/j2k/tests/testData/ast/function/file/functionInFinalClass.jav similarity index 100% rename from j2k/testData/ast/function/file/functionInFinalClass.jav rename to j2k/tests/testData/ast/function/file/functionInFinalClass.jav diff --git a/j2k/testData/ast/function/file/functionInFinalClass.kt b/j2k/tests/testData/ast/function/file/functionInFinalClass.kt similarity index 100% rename from j2k/testData/ast/function/file/functionInFinalClass.kt rename to j2k/tests/testData/ast/function/file/functionInFinalClass.kt diff --git a/j2k/testData/ast/function/file/override.jav b/j2k/tests/testData/ast/function/file/override.jav similarity index 100% rename from j2k/testData/ast/function/file/override.jav rename to j2k/tests/testData/ast/function/file/override.jav diff --git a/j2k/testData/ast/function/file/override.kt b/j2k/tests/testData/ast/function/file/override.kt similarity index 100% rename from j2k/testData/ast/function/file/override.kt rename to j2k/tests/testData/ast/function/file/override.kt diff --git a/j2k/testData/ast/function/file/overrideAndOpen.jav b/j2k/tests/testData/ast/function/file/overrideAndOpen.jav similarity index 100% rename from j2k/testData/ast/function/file/overrideAndOpen.jav rename to j2k/tests/testData/ast/function/file/overrideAndOpen.jav diff --git a/j2k/testData/ast/function/file/overrideAndOpen.kt b/j2k/tests/testData/ast/function/file/overrideAndOpen.kt similarity index 100% rename from j2k/testData/ast/function/file/overrideAndOpen.kt rename to j2k/tests/testData/ast/function/file/overrideAndOpen.kt diff --git a/j2k/testData/ast/function/file/overrideObject.jav b/j2k/tests/testData/ast/function/file/overrideObject.jav similarity index 100% rename from j2k/testData/ast/function/file/overrideObject.jav rename to j2k/tests/testData/ast/function/file/overrideObject.jav diff --git a/j2k/testData/ast/function/file/overrideObject.kt b/j2k/tests/testData/ast/function/file/overrideObject.kt similarity index 100% rename from j2k/testData/ast/function/file/overrideObject.kt rename to j2k/tests/testData/ast/function/file/overrideObject.kt diff --git a/j2k/testData/ast/function/file/varVararg.jav b/j2k/tests/testData/ast/function/file/varVararg.jav similarity index 100% rename from j2k/testData/ast/function/file/varVararg.jav rename to j2k/tests/testData/ast/function/file/varVararg.jav diff --git a/j2k/testData/ast/function/file/varVararg.kt b/j2k/tests/testData/ast/function/file/varVararg.kt similarity index 100% rename from j2k/testData/ast/function/file/varVararg.kt rename to j2k/tests/testData/ast/function/file/varVararg.kt diff --git a/j2k/testData/ast/function/file/writableParameter.jav b/j2k/tests/testData/ast/function/file/writableParameter.jav similarity index 100% rename from j2k/testData/ast/function/file/writableParameter.jav rename to j2k/tests/testData/ast/function/file/writableParameter.jav diff --git a/j2k/testData/ast/function/file/writableParameter.kt b/j2k/tests/testData/ast/function/file/writableParameter.kt similarity index 100% rename from j2k/testData/ast/function/file/writableParameter.kt rename to j2k/tests/testData/ast/function/file/writableParameter.kt diff --git a/j2k/testData/ast/function/method/abstractMethod.jav b/j2k/tests/testData/ast/function/method/abstractMethod.jav similarity index 100% rename from j2k/testData/ast/function/method/abstractMethod.jav rename to j2k/tests/testData/ast/function/method/abstractMethod.jav diff --git a/j2k/testData/ast/function/method/abstractMethod.kt b/j2k/tests/testData/ast/function/method/abstractMethod.kt similarity index 100% rename from j2k/testData/ast/function/method/abstractMethod.kt rename to j2k/tests/testData/ast/function/method/abstractMethod.kt diff --git a/j2k/testData/ast/function/method/classGenericParam.jav b/j2k/tests/testData/ast/function/method/classGenericParam.jav similarity index 100% rename from j2k/testData/ast/function/method/classGenericParam.jav rename to j2k/tests/testData/ast/function/method/classGenericParam.jav diff --git a/j2k/testData/ast/function/method/classGenericParam.kt b/j2k/tests/testData/ast/function/method/classGenericParam.kt similarity index 100% rename from j2k/testData/ast/function/method/classGenericParam.kt rename to j2k/tests/testData/ast/function/method/classGenericParam.kt diff --git a/j2k/testData/ast/function/method/emptyVoidMethod.jav b/j2k/tests/testData/ast/function/method/emptyVoidMethod.jav similarity index 100% rename from j2k/testData/ast/function/method/emptyVoidMethod.jav rename to j2k/tests/testData/ast/function/method/emptyVoidMethod.jav diff --git a/j2k/testData/ast/function/method/emptyVoidMethod.kt b/j2k/tests/testData/ast/function/method/emptyVoidMethod.kt similarity index 100% rename from j2k/testData/ast/function/method/emptyVoidMethod.kt rename to j2k/tests/testData/ast/function/method/emptyVoidMethod.kt diff --git a/j2k/testData/ast/function/method/final.jav b/j2k/tests/testData/ast/function/method/final.jav similarity index 100% rename from j2k/testData/ast/function/method/final.jav rename to j2k/tests/testData/ast/function/method/final.jav diff --git a/j2k/testData/ast/function/method/final.kt b/j2k/tests/testData/ast/function/method/final.kt similarity index 100% rename from j2k/testData/ast/function/method/final.kt rename to j2k/tests/testData/ast/function/method/final.kt diff --git a/j2k/testData/ast/function/method/internal.jav b/j2k/tests/testData/ast/function/method/internal.jav similarity index 100% rename from j2k/testData/ast/function/method/internal.jav rename to j2k/tests/testData/ast/function/method/internal.jav diff --git a/j2k/testData/ast/function/method/internal.kt b/j2k/tests/testData/ast/function/method/internal.kt similarity index 100% rename from j2k/testData/ast/function/method/internal.kt rename to j2k/tests/testData/ast/function/method/internal.kt diff --git a/j2k/testData/ast/function/method/main.jav b/j2k/tests/testData/ast/function/method/main.jav similarity index 100% rename from j2k/testData/ast/function/method/main.jav rename to j2k/tests/testData/ast/function/method/main.jav diff --git a/j2k/testData/ast/function/method/main.kt b/j2k/tests/testData/ast/function/method/main.kt similarity index 100% rename from j2k/testData/ast/function/method/main.kt rename to j2k/tests/testData/ast/function/method/main.kt diff --git a/j2k/testData/ast/function/method/methodClassType.jav b/j2k/tests/testData/ast/function/method/methodClassType.jav similarity index 100% rename from j2k/testData/ast/function/method/methodClassType.jav rename to j2k/tests/testData/ast/function/method/methodClassType.jav diff --git a/j2k/testData/ast/function/method/methodClassType.kt b/j2k/tests/testData/ast/function/method/methodClassType.kt similarity index 100% rename from j2k/testData/ast/function/method/methodClassType.kt rename to j2k/tests/testData/ast/function/method/methodClassType.kt diff --git a/j2k/testData/ast/function/method/methodPrimitiveType.jav b/j2k/tests/testData/ast/function/method/methodPrimitiveType.jav similarity index 100% rename from j2k/testData/ast/function/method/methodPrimitiveType.jav rename to j2k/tests/testData/ast/function/method/methodPrimitiveType.jav diff --git a/j2k/testData/ast/function/method/methodPrimitiveType.kt b/j2k/tests/testData/ast/function/method/methodPrimitiveType.kt similarity index 100% rename from j2k/testData/ast/function/method/methodPrimitiveType.kt rename to j2k/tests/testData/ast/function/method/methodPrimitiveType.kt diff --git a/j2k/testData/ast/function/method/methodPrimitiveType2.jav b/j2k/tests/testData/ast/function/method/methodPrimitiveType2.jav similarity index 100% rename from j2k/testData/ast/function/method/methodPrimitiveType2.jav rename to j2k/tests/testData/ast/function/method/methodPrimitiveType2.jav diff --git a/j2k/testData/ast/function/method/methodPrimitiveType2.kt b/j2k/tests/testData/ast/function/method/methodPrimitiveType2.kt similarity index 100% rename from j2k/testData/ast/function/method/methodPrimitiveType2.kt rename to j2k/tests/testData/ast/function/method/methodPrimitiveType2.kt diff --git a/j2k/testData/ast/function/method/methodWithReturnStatement.jav b/j2k/tests/testData/ast/function/method/methodWithReturnStatement.jav similarity index 100% rename from j2k/testData/ast/function/method/methodWithReturnStatement.jav rename to j2k/tests/testData/ast/function/method/methodWithReturnStatement.jav diff --git a/j2k/testData/ast/function/method/methodWithReturnStatement.kt b/j2k/tests/testData/ast/function/method/methodWithReturnStatement.kt similarity index 100% rename from j2k/testData/ast/function/method/methodWithReturnStatement.kt rename to j2k/tests/testData/ast/function/method/methodWithReturnStatement.kt diff --git a/j2k/testData/ast/function/method/open.jav b/j2k/tests/testData/ast/function/method/open.jav similarity index 100% rename from j2k/testData/ast/function/method/open.jav rename to j2k/tests/testData/ast/function/method/open.jav diff --git a/j2k/testData/ast/function/method/open.kt b/j2k/tests/testData/ast/function/method/open.kt similarity index 100% rename from j2k/testData/ast/function/method/open.kt rename to j2k/tests/testData/ast/function/method/open.kt diff --git a/j2k/testData/ast/function/method/ownGenericParam.jav b/j2k/tests/testData/ast/function/method/ownGenericParam.jav similarity index 100% rename from j2k/testData/ast/function/method/ownGenericParam.jav rename to j2k/tests/testData/ast/function/method/ownGenericParam.jav diff --git a/j2k/testData/ast/function/method/ownGenericParam.kt b/j2k/tests/testData/ast/function/method/ownGenericParam.kt similarity index 100% rename from j2k/testData/ast/function/method/ownGenericParam.kt rename to j2k/tests/testData/ast/function/method/ownGenericParam.kt diff --git a/j2k/testData/ast/function/method/ownSeveralGenericParams.jav b/j2k/tests/testData/ast/function/method/ownSeveralGenericParams.jav similarity index 100% rename from j2k/testData/ast/function/method/ownSeveralGenericParams.jav rename to j2k/tests/testData/ast/function/method/ownSeveralGenericParams.jav diff --git a/j2k/testData/ast/function/method/ownSeveralGenericParams.kt b/j2k/tests/testData/ast/function/method/ownSeveralGenericParams.kt similarity index 100% rename from j2k/testData/ast/function/method/ownSeveralGenericParams.kt rename to j2k/tests/testData/ast/function/method/ownSeveralGenericParams.kt diff --git a/j2k/testData/ast/function/method/private.jav b/j2k/tests/testData/ast/function/method/private.jav similarity index 100% rename from j2k/testData/ast/function/method/private.jav rename to j2k/tests/testData/ast/function/method/private.jav diff --git a/j2k/testData/ast/function/method/private.kt b/j2k/tests/testData/ast/function/method/private.kt similarity index 100% rename from j2k/testData/ast/function/method/private.kt rename to j2k/tests/testData/ast/function/method/private.kt diff --git a/j2k/testData/ast/function/method/protected.jav b/j2k/tests/testData/ast/function/method/protected.jav similarity index 100% rename from j2k/testData/ast/function/method/protected.jav rename to j2k/tests/testData/ast/function/method/protected.jav diff --git a/j2k/testData/ast/function/method/protected.kt b/j2k/tests/testData/ast/function/method/protected.kt similarity index 100% rename from j2k/testData/ast/function/method/protected.kt rename to j2k/tests/testData/ast/function/method/protected.kt diff --git a/j2k/testData/ast/function/method/public.jav b/j2k/tests/testData/ast/function/method/public.jav similarity index 100% rename from j2k/testData/ast/function/method/public.jav rename to j2k/tests/testData/ast/function/method/public.jav diff --git a/j2k/testData/ast/function/method/public.kt b/j2k/tests/testData/ast/function/method/public.kt similarity index 100% rename from j2k/testData/ast/function/method/public.kt rename to j2k/tests/testData/ast/function/method/public.kt diff --git a/j2k/testData/ast/identifier/expression/withDollar.jav b/j2k/tests/testData/ast/identifier/expression/withDollar.jav similarity index 100% rename from j2k/testData/ast/identifier/expression/withDollar.jav rename to j2k/tests/testData/ast/identifier/expression/withDollar.jav diff --git a/j2k/testData/ast/identifier/expression/withDollar.kt b/j2k/tests/testData/ast/identifier/expression/withDollar.kt similarity index 100% rename from j2k/testData/ast/identifier/expression/withDollar.kt rename to j2k/tests/testData/ast/identifier/expression/withDollar.kt diff --git a/j2k/testData/ast/identifier/file/finalFieldReference.jav b/j2k/tests/testData/ast/identifier/file/finalFieldReference.jav similarity index 100% rename from j2k/testData/ast/identifier/file/finalFieldReference.jav rename to j2k/tests/testData/ast/identifier/file/finalFieldReference.jav diff --git a/j2k/testData/ast/identifier/file/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/file/finalFieldReference.kt similarity index 100% rename from j2k/testData/ast/identifier/file/finalFieldReference.kt rename to j2k/tests/testData/ast/identifier/file/finalFieldReference.kt diff --git a/j2k/testData/ast/identifier/statement/keywords.jav b/j2k/tests/testData/ast/identifier/statement/keywords.jav similarity index 100% rename from j2k/testData/ast/identifier/statement/keywords.jav rename to j2k/tests/testData/ast/identifier/statement/keywords.jav diff --git a/j2k/testData/ast/identifier/statement/keywords.kt b/j2k/tests/testData/ast/identifier/statement/keywords.kt similarity index 100% rename from j2k/testData/ast/identifier/statement/keywords.kt rename to j2k/tests/testData/ast/identifier/statement/keywords.kt diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav diff --git a/j2k/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt b/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt similarity index 100% rename from j2k/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt rename to j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt diff --git a/j2k/testData/ast/importStatement/file/importWithKeywords.jav b/j2k/tests/testData/ast/importStatement/file/importWithKeywords.jav similarity index 100% rename from j2k/testData/ast/importStatement/file/importWithKeywords.jav rename to j2k/tests/testData/ast/importStatement/file/importWithKeywords.jav diff --git a/j2k/testData/ast/importStatement/file/importWithKeywords.kt b/j2k/tests/testData/ast/importStatement/file/importWithKeywords.kt similarity index 100% rename from j2k/testData/ast/importStatement/file/importWithKeywords.kt rename to j2k/tests/testData/ast/importStatement/file/importWithKeywords.kt diff --git a/j2k/testData/ast/importStatement/file/importWithStar.jav b/j2k/tests/testData/ast/importStatement/file/importWithStar.jav similarity index 100% rename from j2k/testData/ast/importStatement/file/importWithStar.jav rename to j2k/tests/testData/ast/importStatement/file/importWithStar.jav diff --git a/j2k/testData/ast/importStatement/file/importWithStar.kt b/j2k/tests/testData/ast/importStatement/file/importWithStar.kt similarity index 100% rename from j2k/testData/ast/importStatement/file/importWithStar.kt rename to j2k/tests/testData/ast/importStatement/file/importWithStar.kt diff --git a/j2k/testData/ast/importStatement/file/simpleImport.jav b/j2k/tests/testData/ast/importStatement/file/simpleImport.jav similarity index 100% rename from j2k/testData/ast/importStatement/file/simpleImport.jav rename to j2k/tests/testData/ast/importStatement/file/simpleImport.jav diff --git a/j2k/testData/ast/importStatement/file/simpleImport.kt b/j2k/tests/testData/ast/importStatement/file/simpleImport.kt similarity index 100% rename from j2k/testData/ast/importStatement/file/simpleImport.kt rename to j2k/tests/testData/ast/importStatement/file/simpleImport.kt diff --git a/j2k/testData/ast/inProjectionType/method/methodParams.jav b/j2k/tests/testData/ast/inProjectionType/method/methodParams.jav similarity index 100% rename from j2k/testData/ast/inProjectionType/method/methodParams.jav rename to j2k/tests/testData/ast/inProjectionType/method/methodParams.jav diff --git a/j2k/testData/ast/inProjectionType/method/methodParams.kt b/j2k/tests/testData/ast/inProjectionType/method/methodParams.kt similarity index 100% rename from j2k/testData/ast/inProjectionType/method/methodParams.kt rename to j2k/tests/testData/ast/inProjectionType/method/methodParams.kt diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav diff --git a/j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt similarity index 100% rename from j2k/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt rename to j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt diff --git a/j2k/testData/ast/isOperator/expression/complicatedExpression.jav b/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.jav similarity index 100% rename from j2k/testData/ast/isOperator/expression/complicatedExpression.jav rename to j2k/tests/testData/ast/isOperator/expression/complicatedExpression.jav diff --git a/j2k/testData/ast/isOperator/expression/complicatedExpression.kt b/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt similarity index 100% rename from j2k/testData/ast/isOperator/expression/complicatedExpression.kt rename to j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt diff --git a/j2k/testData/ast/isOperator/expression/simpleReference.jav b/j2k/tests/testData/ast/isOperator/expression/simpleReference.jav similarity index 100% rename from j2k/testData/ast/isOperator/expression/simpleReference.jav rename to j2k/tests/testData/ast/isOperator/expression/simpleReference.jav diff --git a/j2k/testData/ast/isOperator/expression/simpleReference.kt b/j2k/tests/testData/ast/isOperator/expression/simpleReference.kt similarity index 100% rename from j2k/testData/ast/isOperator/expression/simpleReference.kt rename to j2k/tests/testData/ast/isOperator/expression/simpleReference.kt diff --git a/j2k/testData/ast/issues/file/kt-1016.jav b/j2k/tests/testData/ast/issues/file/kt-1016.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-1016.jav rename to j2k/tests/testData/ast/issues/file/kt-1016.jav diff --git a/j2k/testData/ast/issues/file/kt-1016.kt b/j2k/tests/testData/ast/issues/file/kt-1016.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-1016.kt rename to j2k/tests/testData/ast/issues/file/kt-1016.kt diff --git a/j2k/testData/ast/issues/file/kt-1048.jav b/j2k/tests/testData/ast/issues/file/kt-1048.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-1048.jav rename to j2k/tests/testData/ast/issues/file/kt-1048.jav diff --git a/j2k/testData/ast/issues/file/kt-1048.kt b/j2k/tests/testData/ast/issues/file/kt-1048.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-1048.kt rename to j2k/tests/testData/ast/issues/file/kt-1048.kt diff --git a/j2k/testData/ast/issues/file/kt-1074.jav b/j2k/tests/testData/ast/issues/file/kt-1074.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-1074.jav rename to j2k/tests/testData/ast/issues/file/kt-1074.jav diff --git a/j2k/testData/ast/issues/file/kt-1074.kt b/j2k/tests/testData/ast/issues/file/kt-1074.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-1074.kt rename to j2k/tests/testData/ast/issues/file/kt-1074.kt diff --git a/j2k/testData/ast/issues/file/kt-543-boxed.jav b/j2k/tests/testData/ast/issues/file/kt-543-boxed.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-543-boxed.jav rename to j2k/tests/testData/ast/issues/file/kt-543-boxed.jav diff --git a/j2k/testData/ast/issues/file/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/file/kt-543-boxed.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-543-boxed.kt rename to j2k/tests/testData/ast/issues/file/kt-543-boxed.kt diff --git a/j2k/testData/ast/issues/file/kt-543-mixed.jav b/j2k/tests/testData/ast/issues/file/kt-543-mixed.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-543-mixed.jav rename to j2k/tests/testData/ast/issues/file/kt-543-mixed.jav diff --git a/j2k/testData/ast/issues/file/kt-543-mixed.kt b/j2k/tests/testData/ast/issues/file/kt-543-mixed.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-543-mixed.kt rename to j2k/tests/testData/ast/issues/file/kt-543-mixed.kt diff --git a/j2k/testData/ast/issues/file/kt-543.jav b/j2k/tests/testData/ast/issues/file/kt-543.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-543.jav rename to j2k/tests/testData/ast/issues/file/kt-543.jav diff --git a/j2k/testData/ast/issues/file/kt-543.kt b/j2k/tests/testData/ast/issues/file/kt-543.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-543.kt rename to j2k/tests/testData/ast/issues/file/kt-543.kt diff --git a/j2k/testData/ast/issues/file/kt-638.jav b/j2k/tests/testData/ast/issues/file/kt-638.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-638.jav rename to j2k/tests/testData/ast/issues/file/kt-638.jav diff --git a/j2k/testData/ast/issues/file/kt-638.kt b/j2k/tests/testData/ast/issues/file/kt-638.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-638.kt rename to j2k/tests/testData/ast/issues/file/kt-638.kt diff --git a/j2k/testData/ast/issues/file/kt-696.jav b/j2k/tests/testData/ast/issues/file/kt-696.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-696.jav rename to j2k/tests/testData/ast/issues/file/kt-696.jav diff --git a/j2k/testData/ast/issues/file/kt-696.kt b/j2k/tests/testData/ast/issues/file/kt-696.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-696.kt rename to j2k/tests/testData/ast/issues/file/kt-696.kt diff --git a/j2k/testData/ast/issues/file/kt-792-mixed.jav b/j2k/tests/testData/ast/issues/file/kt-792-mixed.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-792-mixed.jav rename to j2k/tests/testData/ast/issues/file/kt-792-mixed.jav diff --git a/j2k/testData/ast/issues/file/kt-792-mixed.kt b/j2k/tests/testData/ast/issues/file/kt-792-mixed.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-792-mixed.kt rename to j2k/tests/testData/ast/issues/file/kt-792-mixed.kt diff --git a/j2k/testData/ast/issues/file/kt-792.jav b/j2k/tests/testData/ast/issues/file/kt-792.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-792.jav rename to j2k/tests/testData/ast/issues/file/kt-792.jav diff --git a/j2k/testData/ast/issues/file/kt-792.kt b/j2k/tests/testData/ast/issues/file/kt-792.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-792.kt rename to j2k/tests/testData/ast/issues/file/kt-792.kt diff --git a/j2k/testData/ast/issues/file/kt-794-mixed.jav b/j2k/tests/testData/ast/issues/file/kt-794-mixed.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-794-mixed.jav rename to j2k/tests/testData/ast/issues/file/kt-794-mixed.jav diff --git a/j2k/testData/ast/issues/file/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/file/kt-794-mixed.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-794-mixed.kt rename to j2k/tests/testData/ast/issues/file/kt-794-mixed.kt diff --git a/j2k/testData/ast/issues/file/kt-794.jav b/j2k/tests/testData/ast/issues/file/kt-794.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-794.jav rename to j2k/tests/testData/ast/issues/file/kt-794.jav diff --git a/j2k/testData/ast/issues/file/kt-794.kt b/j2k/tests/testData/ast/issues/file/kt-794.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-794.kt rename to j2k/tests/testData/ast/issues/file/kt-794.kt diff --git a/j2k/testData/ast/issues/file/kt-809-string.jav b/j2k/tests/testData/ast/issues/file/kt-809-string.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-809-string.jav rename to j2k/tests/testData/ast/issues/file/kt-809-string.jav diff --git a/j2k/testData/ast/issues/file/kt-809-string.kt b/j2k/tests/testData/ast/issues/file/kt-809-string.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-809-string.kt rename to j2k/tests/testData/ast/issues/file/kt-809-string.kt diff --git a/j2k/testData/ast/issues/file/kt-809.jav b/j2k/tests/testData/ast/issues/file/kt-809.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-809.jav rename to j2k/tests/testData/ast/issues/file/kt-809.jav diff --git a/j2k/testData/ast/issues/file/kt-809.kt b/j2k/tests/testData/ast/issues/file/kt-809.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-809.kt rename to j2k/tests/testData/ast/issues/file/kt-809.kt diff --git a/j2k/testData/ast/issues/file/kt-820-field.jav b/j2k/tests/testData/ast/issues/file/kt-820-field.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-820-field.jav rename to j2k/tests/testData/ast/issues/file/kt-820-field.jav diff --git a/j2k/testData/ast/issues/file/kt-820-field.kt b/j2k/tests/testData/ast/issues/file/kt-820-field.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-820-field.kt rename to j2k/tests/testData/ast/issues/file/kt-820-field.kt diff --git a/j2k/testData/ast/issues/file/kt-820-string.jav b/j2k/tests/testData/ast/issues/file/kt-820-string.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-820-string.jav rename to j2k/tests/testData/ast/issues/file/kt-820-string.jav diff --git a/j2k/testData/ast/issues/file/kt-820-string.kt b/j2k/tests/testData/ast/issues/file/kt-820-string.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-820-string.kt rename to j2k/tests/testData/ast/issues/file/kt-820-string.kt diff --git a/j2k/testData/ast/issues/file/kt-820.jav b/j2k/tests/testData/ast/issues/file/kt-820.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-820.jav rename to j2k/tests/testData/ast/issues/file/kt-820.jav diff --git a/j2k/testData/ast/issues/file/kt-820.kt b/j2k/tests/testData/ast/issues/file/kt-820.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-820.kt rename to j2k/tests/testData/ast/issues/file/kt-820.kt diff --git a/j2k/testData/ast/issues/file/kt-824-isDir.jav b/j2k/tests/testData/ast/issues/file/kt-824-isDir.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-824-isDir.jav rename to j2k/tests/testData/ast/issues/file/kt-824-isDir.jav diff --git a/j2k/testData/ast/issues/file/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-824-isDir.kt rename to j2k/tests/testData/ast/issues/file/kt-824-isDir.kt diff --git a/j2k/testData/ast/issues/file/kt-824.jav b/j2k/tests/testData/ast/issues/file/kt-824.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-824.jav rename to j2k/tests/testData/ast/issues/file/kt-824.jav diff --git a/j2k/testData/ast/issues/file/kt-824.kt b/j2k/tests/testData/ast/issues/file/kt-824.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-824.kt rename to j2k/tests/testData/ast/issues/file/kt-824.kt diff --git a/j2k/testData/ast/issues/file/kt-828.jav b/j2k/tests/testData/ast/issues/file/kt-828.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-828.jav rename to j2k/tests/testData/ast/issues/file/kt-828.jav diff --git a/j2k/testData/ast/issues/file/kt-828.kt b/j2k/tests/testData/ast/issues/file/kt-828.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-828.kt rename to j2k/tests/testData/ast/issues/file/kt-828.kt diff --git a/j2k/testData/ast/issues/file/kt-836.jav b/j2k/tests/testData/ast/issues/file/kt-836.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-836.jav rename to j2k/tests/testData/ast/issues/file/kt-836.jav diff --git a/j2k/testData/ast/issues/file/kt-836.kt b/j2k/tests/testData/ast/issues/file/kt-836.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-836.kt rename to j2k/tests/testData/ast/issues/file/kt-836.kt diff --git a/j2k/testData/ast/issues/file/kt-837.jav b/j2k/tests/testData/ast/issues/file/kt-837.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-837.jav rename to j2k/tests/testData/ast/issues/file/kt-837.jav diff --git a/j2k/testData/ast/issues/file/kt-837.kt b/j2k/tests/testData/ast/issues/file/kt-837.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-837.kt rename to j2k/tests/testData/ast/issues/file/kt-837.kt diff --git a/j2k/testData/ast/issues/file/kt-852.jav b/j2k/tests/testData/ast/issues/file/kt-852.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-852.jav rename to j2k/tests/testData/ast/issues/file/kt-852.jav diff --git a/j2k/testData/ast/issues/file/kt-852.kt b/j2k/tests/testData/ast/issues/file/kt-852.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-852.kt rename to j2k/tests/testData/ast/issues/file/kt-852.kt diff --git a/j2k/testData/ast/issues/file/kt-871.jav b/j2k/tests/testData/ast/issues/file/kt-871.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-871.jav rename to j2k/tests/testData/ast/issues/file/kt-871.jav diff --git a/j2k/testData/ast/issues/file/kt-871.kt b/j2k/tests/testData/ast/issues/file/kt-871.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-871.kt rename to j2k/tests/testData/ast/issues/file/kt-871.kt diff --git a/j2k/testData/ast/issues/file/kt-879.jav b/j2k/tests/testData/ast/issues/file/kt-879.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-879.jav rename to j2k/tests/testData/ast/issues/file/kt-879.jav diff --git a/j2k/testData/ast/issues/file/kt-879.kt b/j2k/tests/testData/ast/issues/file/kt-879.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-879.kt rename to j2k/tests/testData/ast/issues/file/kt-879.kt diff --git a/j2k/testData/ast/issues/file/kt-893.jav b/j2k/tests/testData/ast/issues/file/kt-893.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-893.jav rename to j2k/tests/testData/ast/issues/file/kt-893.jav diff --git a/j2k/testData/ast/issues/file/kt-893.kt b/j2k/tests/testData/ast/issues/file/kt-893.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-893.kt rename to j2k/tests/testData/ast/issues/file/kt-893.kt diff --git a/j2k/testData/ast/issues/file/kt-963.jav b/j2k/tests/testData/ast/issues/file/kt-963.jav similarity index 100% rename from j2k/testData/ast/issues/file/kt-963.jav rename to j2k/tests/testData/ast/issues/file/kt-963.jav diff --git a/j2k/testData/ast/issues/file/kt-963.kt b/j2k/tests/testData/ast/issues/file/kt-963.kt similarity index 100% rename from j2k/testData/ast/issues/file/kt-963.kt rename to j2k/tests/testData/ast/issues/file/kt-963.kt diff --git a/j2k/testData/ast/kotlinExclusion/file/kt-656.jav b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.jav similarity index 100% rename from j2k/testData/ast/kotlinExclusion/file/kt-656.jav rename to j2k/tests/testData/ast/kotlinExclusion/file/kt-656.jav diff --git a/j2k/testData/ast/kotlinExclusion/file/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt similarity index 100% rename from j2k/testData/ast/kotlinExclusion/file/kt-656.kt rename to j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt diff --git a/j2k/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav b/j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav similarity index 100% rename from j2k/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav rename to j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav diff --git a/j2k/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt b/j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt similarity index 100% rename from j2k/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt rename to j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt diff --git a/j2k/testData/ast/literalExpression/file/char.jav b/j2k/tests/testData/ast/literalExpression/file/char.jav similarity index 100% rename from j2k/testData/ast/literalExpression/file/char.jav rename to j2k/tests/testData/ast/literalExpression/file/char.jav diff --git a/j2k/testData/ast/literalExpression/file/char.kt b/j2k/tests/testData/ast/literalExpression/file/char.kt similarity index 100% rename from j2k/testData/ast/literalExpression/file/char.kt rename to j2k/tests/testData/ast/literalExpression/file/char.kt diff --git a/j2k/testData/ast/literalExpression/file/dollarInsideString.jav b/j2k/tests/testData/ast/literalExpression/file/dollarInsideString.jav similarity index 100% rename from j2k/testData/ast/literalExpression/file/dollarInsideString.jav rename to j2k/tests/testData/ast/literalExpression/file/dollarInsideString.jav diff --git a/j2k/testData/ast/literalExpression/file/dollarInsideString.kt b/j2k/tests/testData/ast/literalExpression/file/dollarInsideString.kt similarity index 100% rename from j2k/testData/ast/literalExpression/file/dollarInsideString.kt rename to j2k/tests/testData/ast/literalExpression/file/dollarInsideString.kt diff --git a/j2k/testData/ast/literalExpression/file/endsWithDFL.jav b/j2k/tests/testData/ast/literalExpression/file/endsWithDFL.jav similarity index 100% rename from j2k/testData/ast/literalExpression/file/endsWithDFL.jav rename to j2k/tests/testData/ast/literalExpression/file/endsWithDFL.jav diff --git a/j2k/testData/ast/literalExpression/file/endsWithDFL.kt b/j2k/tests/testData/ast/literalExpression/file/endsWithDFL.kt similarity index 100% rename from j2k/testData/ast/literalExpression/file/endsWithDFL.kt rename to j2k/tests/testData/ast/literalExpression/file/endsWithDFL.kt diff --git a/j2k/testData/ast/literalExpression/file/hex.jav b/j2k/tests/testData/ast/literalExpression/file/hex.jav similarity index 100% rename from j2k/testData/ast/literalExpression/file/hex.jav rename to j2k/tests/testData/ast/literalExpression/file/hex.jav diff --git a/j2k/testData/ast/literalExpression/file/hex.kt b/j2k/tests/testData/ast/literalExpression/file/hex.kt similarity index 100% rename from j2k/testData/ast/literalExpression/file/hex.kt rename to j2k/tests/testData/ast/literalExpression/file/hex.kt diff --git a/j2k/testData/ast/literalExpression/file/octal.jav b/j2k/tests/testData/ast/literalExpression/file/octal.jav similarity index 100% rename from j2k/testData/ast/literalExpression/file/octal.jav rename to j2k/tests/testData/ast/literalExpression/file/octal.jav diff --git a/j2k/testData/ast/literalExpression/file/octal.kt b/j2k/tests/testData/ast/literalExpression/file/octal.kt similarity index 100% rename from j2k/testData/ast/literalExpression/file/octal.kt rename to j2k/tests/testData/ast/literalExpression/file/octal.kt diff --git a/j2k/testData/ast/literalExpression/file/trueOrFalse.jav b/j2k/tests/testData/ast/literalExpression/file/trueOrFalse.jav similarity index 100% rename from j2k/testData/ast/literalExpression/file/trueOrFalse.jav rename to j2k/tests/testData/ast/literalExpression/file/trueOrFalse.jav diff --git a/j2k/testData/ast/literalExpression/file/trueOrFalse.kt b/j2k/tests/testData/ast/literalExpression/file/trueOrFalse.kt similarity index 100% rename from j2k/testData/ast/literalExpression/file/trueOrFalse.kt rename to j2k/tests/testData/ast/literalExpression/file/trueOrFalse.kt diff --git a/j2k/testData/ast/localVariable/statement/object.jav b/j2k/tests/testData/ast/localVariable/statement/object.jav similarity index 100% rename from j2k/testData/ast/localVariable/statement/object.jav rename to j2k/tests/testData/ast/localVariable/statement/object.jav diff --git a/j2k/testData/ast/localVariable/statement/object.kt b/j2k/tests/testData/ast/localVariable/statement/object.kt similarity index 100% rename from j2k/testData/ast/localVariable/statement/object.kt rename to j2k/tests/testData/ast/localVariable/statement/object.kt diff --git a/j2k/testData/ast/methodCallExpression/file/genericMethod.jav b/j2k/tests/testData/ast/methodCallExpression/file/genericMethod.jav similarity index 100% rename from j2k/testData/ast/methodCallExpression/file/genericMethod.jav rename to j2k/tests/testData/ast/methodCallExpression/file/genericMethod.jav diff --git a/j2k/testData/ast/methodCallExpression/file/genericMethod.kt b/j2k/tests/testData/ast/methodCallExpression/file/genericMethod.kt similarity index 100% rename from j2k/testData/ast/methodCallExpression/file/genericMethod.kt rename to j2k/tests/testData/ast/methodCallExpression/file/genericMethod.kt diff --git a/j2k/testData/ast/methodCallExpression/statement/callWithKeywords.jav b/j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav similarity index 100% rename from j2k/testData/ast/methodCallExpression/statement/callWithKeywords.jav rename to j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav diff --git a/j2k/testData/ast/methodCallExpression/statement/callWithKeywords.kt b/j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.kt similarity index 100% rename from j2k/testData/ast/methodCallExpression/statement/callWithKeywords.kt rename to j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.kt diff --git a/j2k/testData/ast/methodCallExpression/statement/emptyCall.jav b/j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.jav similarity index 100% rename from j2k/testData/ast/methodCallExpression/statement/emptyCall.jav rename to j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.jav diff --git a/j2k/testData/ast/methodCallExpression/statement/emptyCall.kt b/j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.kt similarity index 100% rename from j2k/testData/ast/methodCallExpression/statement/emptyCall.kt rename to j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.kt diff --git a/j2k/testData/ast/methodCallExpression/statement/simpleCall.jav b/j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.jav similarity index 100% rename from j2k/testData/ast/methodCallExpression/statement/simpleCall.jav rename to j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.jav diff --git a/j2k/testData/ast/methodCallExpression/statement/simpleCall.kt b/j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.kt similarity index 100% rename from j2k/testData/ast/methodCallExpression/statement/simpleCall.kt rename to j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.kt diff --git a/j2k/testData/ast/newClassExpression/expression/classWithParam.jav b/j2k/tests/testData/ast/newClassExpression/expression/classWithParam.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/classWithParam.jav rename to j2k/tests/testData/ast/newClassExpression/expression/classWithParam.jav diff --git a/j2k/testData/ast/newClassExpression/expression/classWithParam.kt b/j2k/tests/testData/ast/newClassExpression/expression/classWithParam.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/classWithParam.kt rename to j2k/tests/testData/ast/newClassExpression/expression/classWithParam.kt diff --git a/j2k/testData/ast/newClassExpression/expression/classWithParams.jav b/j2k/tests/testData/ast/newClassExpression/expression/classWithParams.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/classWithParams.jav rename to j2k/tests/testData/ast/newClassExpression/expression/classWithParams.jav diff --git a/j2k/testData/ast/newClassExpression/expression/classWithParams.kt b/j2k/tests/testData/ast/newClassExpression/expression/classWithParams.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/classWithParams.kt rename to j2k/tests/testData/ast/newClassExpression/expression/classWithParams.kt diff --git a/j2k/testData/ast/newClassExpression/expression/classWithoutBody.jav b/j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/classWithoutBody.jav rename to j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav diff --git a/j2k/testData/ast/newClassExpression/expression/classWithoutBody.kt b/j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/classWithoutBody.kt rename to j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.kt diff --git a/j2k/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav b/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav rename to j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav diff --git a/j2k/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt b/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt rename to j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt diff --git a/j2k/testData/ast/newClassExpression/file/fullQualifiedName.jav b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/file/fullQualifiedName.jav rename to j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav diff --git a/j2k/testData/ast/newClassExpression/file/fullQualifiedName.kt b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/file/fullQualifiedName.kt rename to j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt diff --git a/j2k/testData/ast/newClassExpression/file/fullQualifiedName2.jav b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/file/fullQualifiedName2.jav rename to j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav diff --git a/j2k/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/file/fullQualifiedName2.kt rename to j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt diff --git a/j2k/testData/ast/newClassExpression/file/genericClassInvocation.jav b/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/file/genericClassInvocation.jav rename to j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav diff --git a/j2k/testData/ast/newClassExpression/file/genericClassInvocation.kt b/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/file/genericClassInvocation.kt rename to j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt diff --git a/j2k/testData/ast/newClassExpression/file/newClassByFullName.jav b/j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newClassByFullName.jav rename to j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.jav diff --git a/j2k/testData/ast/newClassExpression/file/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newClassByFullName.kt rename to j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.kt diff --git a/j2k/testData/ast/newClassExpression/file/newInnerClass.jav b/j2k/tests/testData/ast/newClassExpression/file/newInnerClass.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newInnerClass.jav rename to j2k/tests/testData/ast/newClassExpression/file/newInnerClass.jav diff --git a/j2k/testData/ast/newClassExpression/file/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/file/newInnerClass.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newInnerClass.kt rename to j2k/tests/testData/ast/newClassExpression/file/newInnerClass.kt diff --git a/j2k/testData/ast/newClassExpression/file/newListAndNewMember.jav b/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newListAndNewMember.jav rename to j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav diff --git a/j2k/testData/ast/newClassExpression/file/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newListAndNewMember.kt rename to j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt diff --git a/j2k/testData/ast/newClassExpression/file/newStaticInnerClass.jav b/j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newStaticInnerClass.jav rename to j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav diff --git a/j2k/testData/ast/newClassExpression/file/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.kt similarity index 100% rename from j2k/testData/ast/newClassExpression/file/newStaticInnerClass.kt rename to j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.kt diff --git a/j2k/testData/ast/objectLiteral/file/MyFrame.jav b/j2k/tests/testData/ast/objectLiteral/file/MyFrame.jav similarity index 100% rename from j2k/testData/ast/objectLiteral/file/MyFrame.jav rename to j2k/tests/testData/ast/objectLiteral/file/MyFrame.jav diff --git a/j2k/testData/ast/objectLiteral/file/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt similarity index 100% rename from j2k/testData/ast/objectLiteral/file/MyFrame.kt rename to j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt diff --git a/j2k/testData/ast/outProjectionType/method/methodParams.jav b/j2k/tests/testData/ast/outProjectionType/method/methodParams.jav similarity index 100% rename from j2k/testData/ast/outProjectionType/method/methodParams.jav rename to j2k/tests/testData/ast/outProjectionType/method/methodParams.jav diff --git a/j2k/testData/ast/outProjectionType/method/methodParams.kt b/j2k/tests/testData/ast/outProjectionType/method/methodParams.kt similarity index 100% rename from j2k/testData/ast/outProjectionType/method/methodParams.kt rename to j2k/tests/testData/ast/outProjectionType/method/methodParams.kt diff --git a/j2k/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav b/j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav similarity index 100% rename from j2k/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav rename to j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav diff --git a/j2k/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt similarity index 100% rename from j2k/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt rename to j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt diff --git a/j2k/testData/ast/parenthesizedExpression/expression/parenthesized.jav b/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.jav similarity index 100% rename from j2k/testData/ast/parenthesizedExpression/expression/parenthesized.jav rename to j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.jav diff --git a/j2k/testData/ast/parenthesizedExpression/expression/parenthesized.kt b/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.kt similarity index 100% rename from j2k/testData/ast/parenthesizedExpression/expression/parenthesized.kt rename to j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.kt diff --git a/j2k/testData/ast/parenthesizedExpression/expression/parenthesized2.jav b/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.jav similarity index 100% rename from j2k/testData/ast/parenthesizedExpression/expression/parenthesized2.jav rename to j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.jav diff --git a/j2k/testData/ast/parenthesizedExpression/expression/parenthesized2.kt b/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.kt similarity index 100% rename from j2k/testData/ast/parenthesizedExpression/expression/parenthesized2.kt rename to j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.kt diff --git a/j2k/testData/ast/polyadicExpression/expression/divide.jav b/j2k/tests/testData/ast/polyadicExpression/expression/divide.jav similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/divide.jav rename to j2k/tests/testData/ast/polyadicExpression/expression/divide.jav diff --git a/j2k/testData/ast/polyadicExpression/expression/divide.kt b/j2k/tests/testData/ast/polyadicExpression/expression/divide.kt similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/divide.kt rename to j2k/tests/testData/ast/polyadicExpression/expression/divide.kt diff --git a/j2k/testData/ast/polyadicExpression/expression/minus.jav b/j2k/tests/testData/ast/polyadicExpression/expression/minus.jav similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/minus.jav rename to j2k/tests/testData/ast/polyadicExpression/expression/minus.jav diff --git a/j2k/testData/ast/polyadicExpression/expression/minus.kt b/j2k/tests/testData/ast/polyadicExpression/expression/minus.kt similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/minus.kt rename to j2k/tests/testData/ast/polyadicExpression/expression/minus.kt diff --git a/j2k/testData/ast/polyadicExpression/expression/multiply.jav b/j2k/tests/testData/ast/polyadicExpression/expression/multiply.jav similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/multiply.jav rename to j2k/tests/testData/ast/polyadicExpression/expression/multiply.jav diff --git a/j2k/testData/ast/polyadicExpression/expression/multiply.kt b/j2k/tests/testData/ast/polyadicExpression/expression/multiply.kt similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/multiply.kt rename to j2k/tests/testData/ast/polyadicExpression/expression/multiply.kt diff --git a/j2k/testData/ast/polyadicExpression/expression/plus.jav b/j2k/tests/testData/ast/polyadicExpression/expression/plus.jav similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/plus.jav rename to j2k/tests/testData/ast/polyadicExpression/expression/plus.jav diff --git a/j2k/testData/ast/polyadicExpression/expression/plus.kt b/j2k/tests/testData/ast/polyadicExpression/expression/plus.kt similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/plus.kt rename to j2k/tests/testData/ast/polyadicExpression/expression/plus.kt diff --git a/j2k/testData/ast/polyadicExpression/expression/remainder.jav b/j2k/tests/testData/ast/polyadicExpression/expression/remainder.jav similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/remainder.jav rename to j2k/tests/testData/ast/polyadicExpression/expression/remainder.jav diff --git a/j2k/testData/ast/polyadicExpression/expression/remainder.kt b/j2k/tests/testData/ast/polyadicExpression/expression/remainder.kt similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/remainder.kt rename to j2k/tests/testData/ast/polyadicExpression/expression/remainder.kt diff --git a/j2k/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav b/j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav rename to j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav diff --git a/j2k/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt b/j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt similarity index 100% rename from j2k/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt rename to j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt diff --git a/j2k/testData/ast/postfixOperator/statement/decrement.jav b/j2k/tests/testData/ast/postfixOperator/statement/decrement.jav similarity index 100% rename from j2k/testData/ast/postfixOperator/statement/decrement.jav rename to j2k/tests/testData/ast/postfixOperator/statement/decrement.jav diff --git a/j2k/testData/ast/postfixOperator/statement/decrement.kt b/j2k/tests/testData/ast/postfixOperator/statement/decrement.kt similarity index 100% rename from j2k/testData/ast/postfixOperator/statement/decrement.kt rename to j2k/tests/testData/ast/postfixOperator/statement/decrement.kt diff --git a/j2k/testData/ast/postfixOperator/statement/increment.jav b/j2k/tests/testData/ast/postfixOperator/statement/increment.jav similarity index 100% rename from j2k/testData/ast/postfixOperator/statement/increment.jav rename to j2k/tests/testData/ast/postfixOperator/statement/increment.jav diff --git a/j2k/testData/ast/postfixOperator/statement/increment.kt b/j2k/tests/testData/ast/postfixOperator/statement/increment.kt similarity index 100% rename from j2k/testData/ast/postfixOperator/statement/increment.kt rename to j2k/tests/testData/ast/postfixOperator/statement/increment.kt diff --git a/j2k/testData/ast/prefixOperator/statement/decrement.jav b/j2k/tests/testData/ast/prefixOperator/statement/decrement.jav similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/decrement.jav rename to j2k/tests/testData/ast/prefixOperator/statement/decrement.jav diff --git a/j2k/testData/ast/prefixOperator/statement/decrement.kt b/j2k/tests/testData/ast/prefixOperator/statement/decrement.kt similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/decrement.kt rename to j2k/tests/testData/ast/prefixOperator/statement/decrement.kt diff --git a/j2k/testData/ast/prefixOperator/statement/excl.jav b/j2k/tests/testData/ast/prefixOperator/statement/excl.jav similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/excl.jav rename to j2k/tests/testData/ast/prefixOperator/statement/excl.jav diff --git a/j2k/testData/ast/prefixOperator/statement/excl.kt b/j2k/tests/testData/ast/prefixOperator/statement/excl.kt similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/excl.kt rename to j2k/tests/testData/ast/prefixOperator/statement/excl.kt diff --git a/j2k/testData/ast/prefixOperator/statement/increment.jav b/j2k/tests/testData/ast/prefixOperator/statement/increment.jav similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/increment.jav rename to j2k/tests/testData/ast/prefixOperator/statement/increment.jav diff --git a/j2k/testData/ast/prefixOperator/statement/increment.kt b/j2k/tests/testData/ast/prefixOperator/statement/increment.kt similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/increment.kt rename to j2k/tests/testData/ast/prefixOperator/statement/increment.kt diff --git a/j2k/testData/ast/prefixOperator/statement/kt-667.jav b/j2k/tests/testData/ast/prefixOperator/statement/kt-667.jav similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/kt-667.jav rename to j2k/tests/testData/ast/prefixOperator/statement/kt-667.jav diff --git a/j2k/testData/ast/prefixOperator/statement/kt-667.kt b/j2k/tests/testData/ast/prefixOperator/statement/kt-667.kt similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/kt-667.kt rename to j2k/tests/testData/ast/prefixOperator/statement/kt-667.kt diff --git a/j2k/testData/ast/prefixOperator/statement/tilde.jav b/j2k/tests/testData/ast/prefixOperator/statement/tilde.jav similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/tilde.jav rename to j2k/tests/testData/ast/prefixOperator/statement/tilde.jav diff --git a/j2k/testData/ast/prefixOperator/statement/tilde.kt b/j2k/tests/testData/ast/prefixOperator/statement/tilde.kt similarity index 100% rename from j2k/testData/ast/prefixOperator/statement/tilde.kt rename to j2k/tests/testData/ast/prefixOperator/statement/tilde.kt diff --git a/j2k/testData/ast/rawGenerics/file/kt-540-map.jav b/j2k/tests/testData/ast/rawGenerics/file/kt-540-map.jav similarity index 100% rename from j2k/testData/ast/rawGenerics/file/kt-540-map.jav rename to j2k/tests/testData/ast/rawGenerics/file/kt-540-map.jav diff --git a/j2k/testData/ast/rawGenerics/file/kt-540-map.kt b/j2k/tests/testData/ast/rawGenerics/file/kt-540-map.kt similarity index 100% rename from j2k/testData/ast/rawGenerics/file/kt-540-map.kt rename to j2k/tests/testData/ast/rawGenerics/file/kt-540-map.kt diff --git a/j2k/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav b/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav similarity index 100% rename from j2k/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav rename to j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav diff --git a/j2k/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt similarity index 100% rename from j2k/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt rename to j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt diff --git a/j2k/testData/ast/rawGenerics/file/kt-540.jav b/j2k/tests/testData/ast/rawGenerics/file/kt-540.jav similarity index 100% rename from j2k/testData/ast/rawGenerics/file/kt-540.jav rename to j2k/tests/testData/ast/rawGenerics/file/kt-540.jav diff --git a/j2k/testData/ast/rawGenerics/file/kt-540.kt b/j2k/tests/testData/ast/rawGenerics/file/kt-540.kt similarity index 100% rename from j2k/testData/ast/rawGenerics/file/kt-540.kt rename to j2k/tests/testData/ast/rawGenerics/file/kt-540.kt diff --git a/j2k/testData/ast/rawGenerics/file/rawGenericMethod.jav b/j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav similarity index 100% rename from j2k/testData/ast/rawGenerics/file/rawGenericMethod.jav rename to j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav diff --git a/j2k/testData/ast/rawGenerics/file/rawGenericMethod.kt b/j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.kt similarity index 100% rename from j2k/testData/ast/rawGenerics/file/rawGenericMethod.kt rename to j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.kt diff --git a/j2k/testData/ast/returnStatement/statement/returnChar.jav b/j2k/tests/testData/ast/returnStatement/statement/returnChar.jav similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnChar.jav rename to j2k/tests/testData/ast/returnStatement/statement/returnChar.jav diff --git a/j2k/testData/ast/returnStatement/statement/returnChar.kt b/j2k/tests/testData/ast/returnStatement/statement/returnChar.kt similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnChar.kt rename to j2k/tests/testData/ast/returnStatement/statement/returnChar.kt diff --git a/j2k/testData/ast/returnStatement/statement/returnLiteral.jav b/j2k/tests/testData/ast/returnStatement/statement/returnLiteral.jav similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnLiteral.jav rename to j2k/tests/testData/ast/returnStatement/statement/returnLiteral.jav diff --git a/j2k/testData/ast/returnStatement/statement/returnLiteral.kt b/j2k/tests/testData/ast/returnStatement/statement/returnLiteral.kt similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnLiteral.kt rename to j2k/tests/testData/ast/returnStatement/statement/returnLiteral.kt diff --git a/j2k/testData/ast/returnStatement/statement/returnNumber.jav b/j2k/tests/testData/ast/returnStatement/statement/returnNumber.jav similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnNumber.jav rename to j2k/tests/testData/ast/returnStatement/statement/returnNumber.jav diff --git a/j2k/testData/ast/returnStatement/statement/returnNumber.kt b/j2k/tests/testData/ast/returnStatement/statement/returnNumber.kt similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnNumber.kt rename to j2k/tests/testData/ast/returnStatement/statement/returnNumber.kt diff --git a/j2k/testData/ast/returnStatement/statement/returnString.jav b/j2k/tests/testData/ast/returnStatement/statement/returnString.jav similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnString.jav rename to j2k/tests/testData/ast/returnStatement/statement/returnString.jav diff --git a/j2k/testData/ast/returnStatement/statement/returnString.kt b/j2k/tests/testData/ast/returnStatement/statement/returnString.kt similarity index 100% rename from j2k/testData/ast/returnStatement/statement/returnString.kt rename to j2k/tests/testData/ast/returnStatement/statement/returnString.kt diff --git a/j2k/testData/ast/starProjectionType/method/methodParams.jav b/j2k/tests/testData/ast/starProjectionType/method/methodParams.jav similarity index 100% rename from j2k/testData/ast/starProjectionType/method/methodParams.jav rename to j2k/tests/testData/ast/starProjectionType/method/methodParams.jav diff --git a/j2k/testData/ast/starProjectionType/method/methodParams.kt b/j2k/tests/testData/ast/starProjectionType/method/methodParams.kt similarity index 100% rename from j2k/testData/ast/starProjectionType/method/methodParams.kt rename to j2k/tests/testData/ast/starProjectionType/method/methodParams.kt diff --git a/j2k/testData/ast/superExpression/class/classAextendsB.jav b/j2k/tests/testData/ast/superExpression/class/classAextendsB.jav similarity index 100% rename from j2k/testData/ast/superExpression/class/classAextendsB.jav rename to j2k/tests/testData/ast/superExpression/class/classAextendsB.jav diff --git a/j2k/testData/ast/superExpression/class/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/class/classAextendsB.kt similarity index 100% rename from j2k/testData/ast/superExpression/class/classAextendsB.kt rename to j2k/tests/testData/ast/superExpression/class/classAextendsB.kt diff --git a/j2k/testData/ast/superExpression/file/classAdotSuperFoo.jav b/j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav similarity index 100% rename from j2k/testData/ast/superExpression/file/classAdotSuperFoo.jav rename to j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav diff --git a/j2k/testData/ast/superExpression/file/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.kt similarity index 100% rename from j2k/testData/ast/superExpression/file/classAdotSuperFoo.kt rename to j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.kt diff --git a/j2k/testData/ast/superExpression/statement/superStatement.jav b/j2k/tests/testData/ast/superExpression/statement/superStatement.jav similarity index 100% rename from j2k/testData/ast/superExpression/statement/superStatement.jav rename to j2k/tests/testData/ast/superExpression/statement/superStatement.jav diff --git a/j2k/testData/ast/superExpression/statement/superStatement.kt b/j2k/tests/testData/ast/superExpression/statement/superStatement.kt similarity index 100% rename from j2k/testData/ast/superExpression/statement/superStatement.kt rename to j2k/tests/testData/ast/superExpression/statement/superStatement.kt diff --git a/j2k/testData/ast/switch/file/comlicatedFallDown.jav b/j2k/tests/testData/ast/switch/file/comlicatedFallDown.jav similarity index 100% rename from j2k/testData/ast/switch/file/comlicatedFallDown.jav rename to j2k/tests/testData/ast/switch/file/comlicatedFallDown.jav diff --git a/j2k/testData/ast/switch/file/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt similarity index 100% rename from j2k/testData/ast/switch/file/comlicatedFallDown.kt rename to j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt diff --git a/j2k/testData/ast/switch/file/fallDown.jav b/j2k/tests/testData/ast/switch/file/fallDown.jav similarity index 100% rename from j2k/testData/ast/switch/file/fallDown.jav rename to j2k/tests/testData/ast/switch/file/fallDown.jav diff --git a/j2k/testData/ast/switch/file/fallDown.kt b/j2k/tests/testData/ast/switch/file/fallDown.kt similarity index 100% rename from j2k/testData/ast/switch/file/fallDown.kt rename to j2k/tests/testData/ast/switch/file/fallDown.kt diff --git a/j2k/testData/ast/switch/file/kt-539.jav b/j2k/tests/testData/ast/switch/file/kt-539.jav similarity index 100% rename from j2k/testData/ast/switch/file/kt-539.jav rename to j2k/tests/testData/ast/switch/file/kt-539.jav diff --git a/j2k/testData/ast/switch/file/kt-539.kt b/j2k/tests/testData/ast/switch/file/kt-539.kt similarity index 100% rename from j2k/testData/ast/switch/file/kt-539.kt rename to j2k/tests/testData/ast/switch/file/kt-539.kt diff --git a/j2k/testData/ast/synchronizedStatement/statement/singleLineExample.jav b/j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav similarity index 100% rename from j2k/testData/ast/synchronizedStatement/statement/singleLineExample.jav rename to j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav diff --git a/j2k/testData/ast/synchronizedStatement/statement/singleLineExample.kt b/j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.kt similarity index 100% rename from j2k/testData/ast/synchronizedStatement/statement/singleLineExample.kt rename to j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.kt diff --git a/j2k/testData/ast/thisExpression/file/classAdotThisFoo.jav b/j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav similarity index 100% rename from j2k/testData/ast/thisExpression/file/classAdotThisFoo.jav rename to j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav diff --git a/j2k/testData/ast/thisExpression/file/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.kt similarity index 100% rename from j2k/testData/ast/thisExpression/file/classAdotThisFoo.kt rename to j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.kt diff --git a/j2k/testData/ast/thisExpression/statement/thisStatement.jav b/j2k/tests/testData/ast/thisExpression/statement/thisStatement.jav similarity index 100% rename from j2k/testData/ast/thisExpression/statement/thisStatement.jav rename to j2k/tests/testData/ast/thisExpression/statement/thisStatement.jav diff --git a/j2k/testData/ast/thisExpression/statement/thisStatement.kt b/j2k/tests/testData/ast/thisExpression/statement/thisStatement.kt similarity index 100% rename from j2k/testData/ast/thisExpression/statement/thisStatement.kt rename to j2k/tests/testData/ast/thisExpression/statement/thisStatement.kt diff --git a/j2k/testData/ast/throwStatement/statement/simpleThrowStatement.jav b/j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav similarity index 100% rename from j2k/testData/ast/throwStatement/statement/simpleThrowStatement.jav rename to j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav diff --git a/j2k/testData/ast/throwStatement/statement/simpleThrowStatement.kt b/j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.kt similarity index 100% rename from j2k/testData/ast/throwStatement/statement/simpleThrowStatement.kt rename to j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.kt diff --git a/j2k/testData/ast/trait/class/abstactInterface.jav b/j2k/tests/testData/ast/trait/class/abstactInterface.jav similarity index 100% rename from j2k/testData/ast/trait/class/abstactInterface.jav rename to j2k/tests/testData/ast/trait/class/abstactInterface.jav diff --git a/j2k/testData/ast/trait/class/abstactInterface.kt b/j2k/tests/testData/ast/trait/class/abstactInterface.kt similarity index 100% rename from j2k/testData/ast/trait/class/abstactInterface.kt rename to j2k/tests/testData/ast/trait/class/abstactInterface.kt diff --git a/j2k/testData/ast/trait/class/emptyInterface.jav b/j2k/tests/testData/ast/trait/class/emptyInterface.jav similarity index 100% rename from j2k/testData/ast/trait/class/emptyInterface.jav rename to j2k/tests/testData/ast/trait/class/emptyInterface.jav diff --git a/j2k/testData/ast/trait/class/emptyInterface.kt b/j2k/tests/testData/ast/trait/class/emptyInterface.kt similarity index 100% rename from j2k/testData/ast/trait/class/emptyInterface.kt rename to j2k/tests/testData/ast/trait/class/emptyInterface.kt diff --git a/j2k/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav similarity index 100% rename from j2k/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav rename to j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav diff --git a/j2k/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt similarity index 100% rename from j2k/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt rename to j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt diff --git a/j2k/testData/ast/trait/class/extendsOneInterface.jav b/j2k/tests/testData/ast/trait/class/extendsOneInterface.jav similarity index 100% rename from j2k/testData/ast/trait/class/extendsOneInterface.jav rename to j2k/tests/testData/ast/trait/class/extendsOneInterface.jav diff --git a/j2k/testData/ast/trait/class/extendsOneInterface.kt b/j2k/tests/testData/ast/trait/class/extendsOneInterface.kt similarity index 100% rename from j2k/testData/ast/trait/class/extendsOneInterface.kt rename to j2k/tests/testData/ast/trait/class/extendsOneInterface.kt diff --git a/j2k/testData/ast/trait/class/interfaceWithFields.jav b/j2k/tests/testData/ast/trait/class/interfaceWithFields.jav similarity index 100% rename from j2k/testData/ast/trait/class/interfaceWithFields.jav rename to j2k/tests/testData/ast/trait/class/interfaceWithFields.jav diff --git a/j2k/testData/ast/trait/class/interfaceWithFields.kt b/j2k/tests/testData/ast/trait/class/interfaceWithFields.kt similarity index 100% rename from j2k/testData/ast/trait/class/interfaceWithFields.kt rename to j2k/tests/testData/ast/trait/class/interfaceWithFields.kt diff --git a/j2k/testData/ast/trait/class/interfaceWithMethodDeclaration.jav b/j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav similarity index 100% rename from j2k/testData/ast/trait/class/interfaceWithMethodDeclaration.jav rename to j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav diff --git a/j2k/testData/ast/trait/class/interfaceWithMethodDeclaration.kt b/j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.kt similarity index 100% rename from j2k/testData/ast/trait/class/interfaceWithMethodDeclaration.kt rename to j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.kt diff --git a/j2k/testData/ast/trait/class/interfaceWithStaticFields.jav b/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.jav similarity index 100% rename from j2k/testData/ast/trait/class/interfaceWithStaticFields.jav rename to j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.jav diff --git a/j2k/testData/ast/trait/class/interfaceWithStaticFields.kt b/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt similarity index 100% rename from j2k/testData/ast/trait/class/interfaceWithStaticFields.kt rename to j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt diff --git a/j2k/testData/ast/trait/class/internalInterface.jav b/j2k/tests/testData/ast/trait/class/internalInterface.jav similarity index 100% rename from j2k/testData/ast/trait/class/internalInterface.jav rename to j2k/tests/testData/ast/trait/class/internalInterface.jav diff --git a/j2k/testData/ast/trait/class/internalInterface.kt b/j2k/tests/testData/ast/trait/class/internalInterface.kt similarity index 100% rename from j2k/testData/ast/trait/class/internalInterface.kt rename to j2k/tests/testData/ast/trait/class/internalInterface.kt diff --git a/j2k/testData/ast/trait/class/privateInterface.jav b/j2k/tests/testData/ast/trait/class/privateInterface.jav similarity index 100% rename from j2k/testData/ast/trait/class/privateInterface.jav rename to j2k/tests/testData/ast/trait/class/privateInterface.jav diff --git a/j2k/testData/ast/trait/class/privateInterface.kt b/j2k/tests/testData/ast/trait/class/privateInterface.kt similarity index 100% rename from j2k/testData/ast/trait/class/privateInterface.kt rename to j2k/tests/testData/ast/trait/class/privateInterface.kt diff --git a/j2k/testData/ast/trait/class/protectedInterface.jav b/j2k/tests/testData/ast/trait/class/protectedInterface.jav similarity index 100% rename from j2k/testData/ast/trait/class/protectedInterface.jav rename to j2k/tests/testData/ast/trait/class/protectedInterface.jav diff --git a/j2k/testData/ast/trait/class/protectedInterface.kt b/j2k/tests/testData/ast/trait/class/protectedInterface.kt similarity index 100% rename from j2k/testData/ast/trait/class/protectedInterface.kt rename to j2k/tests/testData/ast/trait/class/protectedInterface.kt diff --git a/j2k/testData/ast/trait/class/publicInterface.jav b/j2k/tests/testData/ast/trait/class/publicInterface.jav similarity index 100% rename from j2k/testData/ast/trait/class/publicInterface.jav rename to j2k/tests/testData/ast/trait/class/publicInterface.jav diff --git a/j2k/testData/ast/trait/class/publicInterface.kt b/j2k/tests/testData/ast/trait/class/publicInterface.kt similarity index 100% rename from j2k/testData/ast/trait/class/publicInterface.kt rename to j2k/tests/testData/ast/trait/class/publicInterface.kt diff --git a/j2k/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav b/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav similarity index 100% rename from j2k/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav rename to j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav diff --git a/j2k/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt b/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt similarity index 100% rename from j2k/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt rename to j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt diff --git a/j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav similarity index 100% rename from j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav rename to j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav diff --git a/j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt similarity index 100% rename from j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt rename to j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt diff --git a/j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav similarity index 100% rename from j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav rename to j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav diff --git a/j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt similarity index 100% rename from j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt rename to j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt diff --git a/j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav similarity index 100% rename from j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav rename to j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav diff --git a/j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt b/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt similarity index 100% rename from j2k/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt rename to j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/fooCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/fooCast.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/fooCast.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/fooCast.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/fooCast.kt b/j2k/tests/testData/ast/typeCastExpression/expression/fooCast.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/fooCast.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/fooCast.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/intCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/intCast.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/intCast.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/intCast.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/intCast.kt b/j2k/tests/testData/ast/typeCastExpression/expression/intCast.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/intCast.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/intCast.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/primitiveType.jav b/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/primitiveType.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/primitiveType.kt b/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/primitiveType.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/simpleGenericCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/simpleGenericCast.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/simpleGenericCast.kt b/j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/simpleGenericCast.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/stringCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/stringCast.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/stringCast.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/stringCast.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/stringCast.kt b/j2k/tests/testData/ast/typeCastExpression/expression/stringCast.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/stringCast.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/stringCast.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/superWildcardCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/superWildcardCast.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/superWildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/superWildcardCast.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.kt diff --git a/j2k/testData/ast/typeCastExpression/expression/wildcardCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/wildcardCast.jav rename to j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav diff --git a/j2k/testData/ast/typeCastExpression/expression/wildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.kt similarity index 100% rename from j2k/testData/ast/typeCastExpression/expression/wildcardCast.kt rename to j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.kt diff --git a/j2k/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav b/j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav similarity index 100% rename from j2k/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav rename to j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav diff --git a/j2k/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from j2k/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt rename to j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt diff --git a/j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav b/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav similarity index 100% rename from j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav rename to j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav diff --git a/j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt similarity index 100% rename from j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt rename to j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt diff --git a/j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav b/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav similarity index 100% rename from j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav rename to j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav diff --git a/j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from j2k/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt rename to j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt diff --git a/j2k/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav b/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav similarity index 100% rename from j2k/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav rename to j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav diff --git a/j2k/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt b/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt similarity index 100% rename from j2k/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt rename to j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt diff --git a/j2k/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav b/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav similarity index 100% rename from j2k/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav rename to j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav diff --git a/j2k/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt b/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt similarity index 100% rename from j2k/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt rename to j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt diff --git a/j2k/testData/ast/typeParameters/class/genericClass.jav b/j2k/tests/testData/ast/typeParameters/class/genericClass.jav similarity index 100% rename from j2k/testData/ast/typeParameters/class/genericClass.jav rename to j2k/tests/testData/ast/typeParameters/class/genericClass.jav diff --git a/j2k/testData/ast/typeParameters/class/genericClass.kt b/j2k/tests/testData/ast/typeParameters/class/genericClass.kt similarity index 100% rename from j2k/testData/ast/typeParameters/class/genericClass.kt rename to j2k/tests/testData/ast/typeParameters/class/genericClass.kt diff --git a/j2k/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav b/j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav similarity index 100% rename from j2k/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav rename to j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav diff --git a/j2k/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt similarity index 100% rename from j2k/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt rename to j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt diff --git a/j2k/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav b/j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav similarity index 100% rename from j2k/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav rename to j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav diff --git a/j2k/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt similarity index 100% rename from j2k/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt rename to j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt diff --git a/j2k/testData/ast/typeParameters/method/where.jav b/j2k/tests/testData/ast/typeParameters/method/where.jav similarity index 100% rename from j2k/testData/ast/typeParameters/method/where.jav rename to j2k/tests/testData/ast/typeParameters/method/where.jav diff --git a/j2k/testData/ast/typeParameters/method/where.kt b/j2k/tests/testData/ast/typeParameters/method/where.kt similarity index 100% rename from j2k/testData/ast/typeParameters/method/where.kt rename to j2k/tests/testData/ast/typeParameters/method/where.kt diff --git a/j2k/testData/ast/typeParameters/statement/genericParam.jav b/j2k/tests/testData/ast/typeParameters/statement/genericParam.jav similarity index 100% rename from j2k/testData/ast/typeParameters/statement/genericParam.jav rename to j2k/tests/testData/ast/typeParameters/statement/genericParam.jav diff --git a/j2k/testData/ast/typeParameters/statement/genericParam.kt b/j2k/tests/testData/ast/typeParameters/statement/genericParam.kt similarity index 100% rename from j2k/testData/ast/typeParameters/statement/genericParam.kt rename to j2k/tests/testData/ast/typeParameters/statement/genericParam.kt diff --git a/j2k/testData/ast/typeParameters/statement/manyGenericParams.jav b/j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.jav similarity index 100% rename from j2k/testData/ast/typeParameters/statement/manyGenericParams.jav rename to j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.jav diff --git a/j2k/testData/ast/typeParameters/statement/manyGenericParams.kt b/j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.kt similarity index 100% rename from j2k/testData/ast/typeParameters/statement/manyGenericParams.kt rename to j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.kt diff --git a/j2k/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav b/j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav similarity index 100% rename from j2k/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav rename to j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav diff --git a/j2k/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt b/j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt similarity index 100% rename from j2k/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt rename to j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt diff --git a/j2k/testData/ast/varArg/method/ellipsisTypeSingleParams.jav b/j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav similarity index 100% rename from j2k/testData/ast/varArg/method/ellipsisTypeSingleParams.jav rename to j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav diff --git a/j2k/testData/ast/varArg/method/ellipsisTypeSingleParams.kt b/j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.kt similarity index 100% rename from j2k/testData/ast/varArg/method/ellipsisTypeSingleParams.kt rename to j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.kt diff --git a/j2k/testData/ast/whileStatement/statement/whileWithBlock.jav b/j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.jav similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithBlock.jav rename to j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.jav diff --git a/j2k/testData/ast/whileStatement/statement/whileWithBlock.kt b/j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.kt similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithBlock.kt rename to j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.kt diff --git a/j2k/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav b/j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav rename to j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav diff --git a/j2k/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt rename to j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt diff --git a/j2k/testData/ast/whileStatement/statement/whileWithExpression.jav b/j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.jav similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithExpression.jav rename to j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.jav diff --git a/j2k/testData/ast/whileStatement/statement/whileWithExpression.kt b/j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.kt similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithExpression.kt rename to j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.kt diff --git a/j2k/testData/ast/whileStatement/statement/whileWithReturn.jav b/j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.jav similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithReturn.jav rename to j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.jav diff --git a/j2k/testData/ast/whileStatement/statement/whileWithReturn.kt b/j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.kt similarity index 100% rename from j2k/testData/ast/whileStatement/statement/whileWithReturn.kt rename to j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.kt