diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
index ae47e98b7d6..cfbc8e24a8a 100644
--- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
+++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
@@ -39,10 +39,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
 
     String actual = "";
     if (javaFile.getParent().endsWith("/expression")) actual = expressionToKotlin(javaCode);
-
-    else if (javaFile.getParent().endsWith("/statement")) actual = statementToSingleLineKotlin(javaCode);
-    else if (javaFile.getParent().endsWith("/statement_mult")) actual = statementToKotlin(javaCode);
-
+    else if (javaFile.getParent().endsWith("/statement")) actual = statementToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/method")) actual = methodToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/class")) actual = classToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
@@ -108,14 +105,6 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  protected String methodToSingleLineKotlin(String text) throws IOException {
-    return toSingleLine(methodToKotlin(text));
-  }
-
-  protected String statementToSingleLineKotlin(String code) throws Exception {
-    return toSingleLine(statementToKotlin(code));
-  }
-
   @NotNull
   protected String methodToKotlin(String text) throws IOException {
     String result = classToKotlin("final class C {" + text + "}")
@@ -152,9 +141,4 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
       .trim()
       ;
   }
-
-  @NotNull
-  public static String toSingleLine(String string) {
-    return prettify(string.replaceAll("\n", " "));
-  }
 }
\ No newline at end of file
diff --git a/testData/ast/arrayType/statement_mult/doubleArray.jav b/testData/ast/arrayType/statement/doubleArray.jav
similarity index 100%
rename from testData/ast/arrayType/statement_mult/doubleArray.jav
rename to testData/ast/arrayType/statement/doubleArray.jav
diff --git a/testData/ast/arrayType/statement_mult/doubleArray.kt b/testData/ast/arrayType/statement/doubleArray.kt
similarity index 100%
rename from testData/ast/arrayType/statement_mult/doubleArray.kt
rename to testData/ast/arrayType/statement/doubleArray.kt
diff --git a/testData/ast/arrayType/statement_mult/longArray.jav b/testData/ast/arrayType/statement/longArray.jav
similarity index 100%
rename from testData/ast/arrayType/statement_mult/longArray.jav
rename to testData/ast/arrayType/statement/longArray.jav
diff --git a/testData/ast/arrayType/statement_mult/longArray.kt b/testData/ast/arrayType/statement/longArray.kt
similarity index 100%
rename from testData/ast/arrayType/statement_mult/longArray.kt
rename to testData/ast/arrayType/statement/longArray.kt
diff --git a/testData/ast/arrayType/statement_mult/newIntArray.jav b/testData/ast/arrayType/statement/newIntArray.jav
similarity index 100%
rename from testData/ast/arrayType/statement_mult/newIntArray.jav
rename to testData/ast/arrayType/statement/newIntArray.jav
diff --git a/testData/ast/arrayType/statement_mult/newIntArray.kt b/testData/ast/arrayType/statement/newIntArray.kt
similarity index 100%
rename from testData/ast/arrayType/statement_mult/newIntArray.kt
rename to testData/ast/arrayType/statement/newIntArray.kt
diff --git a/testData/ast/arrayType/statement_mult/newStringArray.jav b/testData/ast/arrayType/statement/newStringArray.jav
similarity index 100%
rename from testData/ast/arrayType/statement_mult/newStringArray.jav
rename to testData/ast/arrayType/statement/newStringArray.jav
diff --git a/testData/ast/arrayType/statement_mult/newStringArray.kt b/testData/ast/arrayType/statement/newStringArray.kt
similarity index 100%
rename from testData/ast/arrayType/statement_mult/newStringArray.kt
rename to testData/ast/arrayType/statement/newStringArray.kt
diff --git a/testData/ast/assertStatement/statement_mult/onlyCondition.jav b/testData/ast/assertStatement/statement/onlyCondition.jav
similarity index 100%
rename from testData/ast/assertStatement/statement_mult/onlyCondition.jav
rename to testData/ast/assertStatement/statement/onlyCondition.jav
diff --git a/testData/ast/assertStatement/statement_mult/onlyCondition.kt b/testData/ast/assertStatement/statement/onlyCondition.kt
similarity index 100%
rename from testData/ast/assertStatement/statement_mult/onlyCondition.kt
rename to testData/ast/assertStatement/statement/onlyCondition.kt
diff --git a/testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.jav b/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav
similarity index 100%
rename from testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.jav
rename to testData/ast/assertStatement/statement/onlyConditionWithBraces.jav
diff --git a/testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.kt b/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt
similarity index 100%
rename from testData/ast/assertStatement/statement_mult/onlyConditionWithBraces.kt
rename to testData/ast/assertStatement/statement/onlyConditionWithBraces.kt
diff --git a/testData/ast/assertStatement/statement_mult/withStringDetail.jav b/testData/ast/assertStatement/statement/withStringDetail.jav
similarity index 100%
rename from testData/ast/assertStatement/statement_mult/withStringDetail.jav
rename to testData/ast/assertStatement/statement/withStringDetail.jav
diff --git a/testData/ast/assertStatement/statement_mult/withStringDetail.kt b/testData/ast/assertStatement/statement/withStringDetail.kt
similarity index 100%
rename from testData/ast/assertStatement/statement_mult/withStringDetail.kt
rename to testData/ast/assertStatement/statement/withStringDetail.kt
diff --git a/testData/ast/boxedType/statement_mult/boolean.jav b/testData/ast/boxedType/statement/boolean.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/boolean.jav
rename to testData/ast/boxedType/statement/boolean.jav
diff --git a/testData/ast/boxedType/statement_mult/boolean.kt b/testData/ast/boxedType/statement/boolean.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/boolean.kt
rename to testData/ast/boxedType/statement/boolean.kt
diff --git a/testData/ast/boxedType/statement_mult/byte.jav b/testData/ast/boxedType/statement/byte.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/byte.jav
rename to testData/ast/boxedType/statement/byte.jav
diff --git a/testData/ast/boxedType/statement_mult/byte.kt b/testData/ast/boxedType/statement/byte.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/byte.kt
rename to testData/ast/boxedType/statement/byte.kt
diff --git a/testData/ast/boxedType/statement_mult/character.jav b/testData/ast/boxedType/statement/character.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/character.jav
rename to testData/ast/boxedType/statement/character.jav
diff --git a/testData/ast/boxedType/statement_mult/character.kt b/testData/ast/boxedType/statement/character.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/character.kt
rename to testData/ast/boxedType/statement/character.kt
diff --git a/testData/ast/boxedType/statement_mult/double.jav b/testData/ast/boxedType/statement/double.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/double.jav
rename to testData/ast/boxedType/statement/double.jav
diff --git a/testData/ast/boxedType/statement_mult/double.kt b/testData/ast/boxedType/statement/double.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/double.kt
rename to testData/ast/boxedType/statement/double.kt
diff --git a/testData/ast/boxedType/statement_mult/float.jav b/testData/ast/boxedType/statement/float.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/float.jav
rename to testData/ast/boxedType/statement/float.jav
diff --git a/testData/ast/boxedType/statement_mult/float.kt b/testData/ast/boxedType/statement/float.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/float.kt
rename to testData/ast/boxedType/statement/float.kt
diff --git a/testData/ast/boxedType/statement_mult/integer.jav b/testData/ast/boxedType/statement/integer.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/integer.jav
rename to testData/ast/boxedType/statement/integer.jav
diff --git a/testData/ast/boxedType/statement_mult/integer.kt b/testData/ast/boxedType/statement/integer.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/integer.kt
rename to testData/ast/boxedType/statement/integer.kt
diff --git a/testData/ast/boxedType/statement_mult/long.jav b/testData/ast/boxedType/statement/long.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/long.jav
rename to testData/ast/boxedType/statement/long.jav
diff --git a/testData/ast/boxedType/statement_mult/long.kt b/testData/ast/boxedType/statement/long.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/long.kt
rename to testData/ast/boxedType/statement/long.kt
diff --git a/testData/ast/boxedType/statement_mult/object.jav b/testData/ast/boxedType/statement/object.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/object.jav
rename to testData/ast/boxedType/statement/object.jav
diff --git a/testData/ast/boxedType/statement_mult/object.kt b/testData/ast/boxedType/statement/object.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/object.kt
rename to testData/ast/boxedType/statement/object.kt
diff --git a/testData/ast/boxedType/statement_mult/short.jav b/testData/ast/boxedType/statement/short.jav
similarity index 100%
rename from testData/ast/boxedType/statement_mult/short.jav
rename to testData/ast/boxedType/statement/short.jav
diff --git a/testData/ast/boxedType/statement_mult/short.kt b/testData/ast/boxedType/statement/short.kt
similarity index 100%
rename from testData/ast/boxedType/statement_mult/short.kt
rename to testData/ast/boxedType/statement/short.kt
diff --git a/testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav b/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav
similarity index 100%
rename from testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.jav
rename to testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav
diff --git a/testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt b/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt
similarity index 100%
rename from testData/ast/declarationStatement/statement_mult/multiplyFinalIntDeclaration.kt
rename to testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt
diff --git a/testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.jav b/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav
similarity index 100%
rename from testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.jav
rename to testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav
diff --git a/testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.kt b/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt
similarity index 100%
rename from testData/ast/declarationStatement/statement_mult/multiplyIntDeclaration.kt
rename to testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithBlock.jav b/testData/ast/doWhileStatement/statement/whileWithBlock.jav
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithBlock.jav
rename to testData/ast/doWhileStatement/statement/whileWithBlock.jav
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithBlock.kt b/testData/ast/doWhileStatement/statement/whileWithBlock.kt
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithBlock.kt
rename to testData/ast/doWhileStatement/statement/whileWithBlock.kt
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.jav b/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.jav
rename to testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.kt b/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithEmptyBlock.kt
rename to testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithExpression.jav b/testData/ast/doWhileStatement/statement/whileWithExpression.jav
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithExpression.jav
rename to testData/ast/doWhileStatement/statement/whileWithExpression.jav
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithExpression.kt b/testData/ast/doWhileStatement/statement/whileWithExpression.kt
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithExpression.kt
rename to testData/ast/doWhileStatement/statement/whileWithExpression.kt
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithReturn.jav b/testData/ast/doWhileStatement/statement/whileWithReturn.jav
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithReturn.jav
rename to testData/ast/doWhileStatement/statement/whileWithReturn.jav
diff --git a/testData/ast/doWhileStatement/statement_mult/whileWithReturn.kt b/testData/ast/doWhileStatement/statement/whileWithReturn.kt
similarity index 100%
rename from testData/ast/doWhileStatement/statement_mult/whileWithReturn.kt
rename to testData/ast/doWhileStatement/statement/whileWithReturn.kt
diff --git a/testData/ast/for/statement_mult/commonCaseForTest.jav b/testData/ast/for/statement/commonCaseForTest.jav
similarity index 100%
rename from testData/ast/for/statement_mult/commonCaseForTest.jav
rename to testData/ast/for/statement/commonCaseForTest.jav
diff --git a/testData/ast/for/statement_mult/commonCaseForTest.kt b/testData/ast/for/statement/commonCaseForTest.kt
similarity index 100%
rename from testData/ast/for/statement_mult/commonCaseForTest.kt
rename to testData/ast/for/statement/commonCaseForTest.kt
diff --git a/testData/ast/for/statement_mult/forWithBlock.jav b/testData/ast/for/statement/forWithBlock.jav
similarity index 100%
rename from testData/ast/for/statement_mult/forWithBlock.jav
rename to testData/ast/for/statement/forWithBlock.jav
diff --git a/testData/ast/for/statement_mult/forWithBlock.kt b/testData/ast/for/statement/forWithBlock.kt
similarity index 100%
rename from testData/ast/for/statement_mult/forWithBlock.kt
rename to testData/ast/for/statement/forWithBlock.kt
diff --git a/testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.jav b/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav
similarity index 100%
rename from testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.jav
rename to testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav
diff --git a/testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.kt b/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt
similarity index 100%
rename from testData/ast/for/statement_mult/forWithBlockAndDoubleUpdate.kt
rename to testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt
diff --git a/testData/ast/for/statement_mult/forWithEmptyBlock.jav b/testData/ast/for/statement/forWithEmptyBlock.jav
similarity index 100%
rename from testData/ast/for/statement_mult/forWithEmptyBlock.jav
rename to testData/ast/for/statement/forWithEmptyBlock.jav
diff --git a/testData/ast/for/statement_mult/forWithEmptyBlock.kt b/testData/ast/for/statement/forWithEmptyBlock.kt
similarity index 100%
rename from testData/ast/for/statement_mult/forWithEmptyBlock.kt
rename to testData/ast/for/statement/forWithEmptyBlock.kt
diff --git a/testData/ast/for/statement_mult/forWithExpression.jav b/testData/ast/for/statement/forWithExpression.jav
similarity index 100%
rename from testData/ast/for/statement_mult/forWithExpression.jav
rename to testData/ast/for/statement/forWithExpression.jav
diff --git a/testData/ast/for/statement_mult/forWithExpression.kt b/testData/ast/for/statement/forWithExpression.kt
similarity index 100%
rename from testData/ast/for/statement_mult/forWithExpression.kt
rename to testData/ast/for/statement/forWithExpression.kt
diff --git a/testData/ast/for/statement_mult/forWithReturn.jav b/testData/ast/for/statement/forWithReturn.jav
similarity index 100%
rename from testData/ast/for/statement_mult/forWithReturn.jav
rename to testData/ast/for/statement/forWithReturn.jav
diff --git a/testData/ast/for/statement_mult/forWithReturn.kt b/testData/ast/for/statement/forWithReturn.kt
similarity index 100%
rename from testData/ast/for/statement_mult/forWithReturn.kt
rename to testData/ast/for/statement/forWithReturn.kt
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.jav b/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.jav
rename to testData/ast/foreachStatement/statement/enhancedForWithBlock.jav
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.kt b/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithBlock.kt
rename to testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav b/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.jav
rename to testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt b/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithEmptyBlock.kt
rename to testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.jav b/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.jav
rename to testData/ast/foreachStatement/statement/enhancedForWithExpression.jav
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.kt b/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithExpression.kt
rename to testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.jav b/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.jav
rename to testData/ast/foreachStatement/statement/enhancedForWithReturn.jav
diff --git a/testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.kt b/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt
similarity index 100%
rename from testData/ast/foreachStatement/statement_mult/enhancedForWithReturn.kt
rename to testData/ast/foreachStatement/statement/enhancedForWithReturn.kt
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav b/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.jav
rename to testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt b/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithEmptyBlocks.kt
rename to testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav b/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.jav
rename to testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt b/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithMultilineBlocks.kt
rename to testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav b/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.jav
rename to testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt b/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithOneLineBlocks.kt
rename to testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.jav b/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.jav
rename to testData/ast/ifStatement/statement/ifStatementWithoutElse.jav
diff --git a/testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.kt b/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
similarity index 100%
rename from testData/ast/ifStatement/statement_mult/ifStatementWithoutElse.kt
rename to testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
diff --git a/testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav b/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav
similarity index 100%
rename from testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.jav
rename to testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav
diff --git a/testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt b/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt
similarity index 100%
rename from testData/ast/labelStatement/statement_mult/complicatedExampleFromJavaTutorial.kt
rename to testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt
diff --git a/testData/ast/postfixOperator/statement_mult/decrement.jav b/testData/ast/postfixOperator/statement/decrement.jav
similarity index 100%
rename from testData/ast/postfixOperator/statement_mult/decrement.jav
rename to testData/ast/postfixOperator/statement/decrement.jav
diff --git a/testData/ast/postfixOperator/statement_mult/decrement.kt b/testData/ast/postfixOperator/statement/decrement.kt
similarity index 100%
rename from testData/ast/postfixOperator/statement_mult/decrement.kt
rename to testData/ast/postfixOperator/statement/decrement.kt
diff --git a/testData/ast/postfixOperator/statement_mult/increment.jav b/testData/ast/postfixOperator/statement/increment.jav
similarity index 100%
rename from testData/ast/postfixOperator/statement_mult/increment.jav
rename to testData/ast/postfixOperator/statement/increment.jav
diff --git a/testData/ast/postfixOperator/statement_mult/increment.kt b/testData/ast/postfixOperator/statement/increment.kt
similarity index 100%
rename from testData/ast/postfixOperator/statement_mult/increment.kt
rename to testData/ast/postfixOperator/statement/increment.kt
diff --git a/testData/ast/prefixOperator/statement_mult/decrement.jav b/testData/ast/prefixOperator/statement/decrement.jav
similarity index 100%
rename from testData/ast/prefixOperator/statement_mult/decrement.jav
rename to testData/ast/prefixOperator/statement/decrement.jav
diff --git a/testData/ast/prefixOperator/statement_mult/decrement.kt b/testData/ast/prefixOperator/statement/decrement.kt
similarity index 100%
rename from testData/ast/prefixOperator/statement_mult/decrement.kt
rename to testData/ast/prefixOperator/statement/decrement.kt
diff --git a/testData/ast/prefixOperator/statement_mult/increment.jav b/testData/ast/prefixOperator/statement/increment.jav
similarity index 100%
rename from testData/ast/prefixOperator/statement_mult/increment.jav
rename to testData/ast/prefixOperator/statement/increment.jav
diff --git a/testData/ast/prefixOperator/statement_mult/increment.kt b/testData/ast/prefixOperator/statement/increment.kt
similarity index 100%
rename from testData/ast/prefixOperator/statement_mult/increment.kt
rename to testData/ast/prefixOperator/statement/increment.kt
diff --git a/testData/ast/synchronizedStatement/statement/singleLineExample.kt b/testData/ast/synchronizedStatement/statement/singleLineExample.kt
index 033b39c45cf..6665fbbba33 100644
--- a/testData/ast/synchronizedStatement/statement/singleLineExample.kt
+++ b/testData/ast/synchronizedStatement/statement/singleLineExample.kt
@@ -1 +1,3 @@
-synchronized (s) { doSomething(s) }
\ No newline at end of file
+synchronized (s) {
+doSomething(s)
+}
\ No newline at end of file
diff --git a/testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.jav b/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.jav
rename to testData/ast/tryStatement/statement/commonCaseForTryStatement.jav
diff --git a/testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.kt b/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/commonCaseForTryStatement.kt
rename to testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
diff --git a/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav b/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.jav
rename to testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav
diff --git a/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt b/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithEmptyFinally.kt
rename to testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
diff --git a/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav b/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.jav
rename to testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav
diff --git a/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt b/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithFinally.kt
rename to testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
diff --git a/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav b/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.jav
rename to testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav
diff --git a/testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt b/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
similarity index 100%
rename from testData/ast/tryStatement/statement_mult/emptyTryWithTwoCatchesWithoutFinally.kt
rename to testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
diff --git a/testData/ast/typeParameters/statement_mult/genericParam.jav b/testData/ast/typeParameters/statement/genericParam.jav
similarity index 100%
rename from testData/ast/typeParameters/statement_mult/genericParam.jav
rename to testData/ast/typeParameters/statement/genericParam.jav
diff --git a/testData/ast/typeParameters/statement_mult/genericParam.kt b/testData/ast/typeParameters/statement/genericParam.kt
similarity index 100%
rename from testData/ast/typeParameters/statement_mult/genericParam.kt
rename to testData/ast/typeParameters/statement/genericParam.kt
diff --git a/testData/ast/typeParameters/statement_mult/manyGenericParams.jav b/testData/ast/typeParameters/statement/manyGenericParams.jav
similarity index 100%
rename from testData/ast/typeParameters/statement_mult/manyGenericParams.jav
rename to testData/ast/typeParameters/statement/manyGenericParams.jav
diff --git a/testData/ast/typeParameters/statement_mult/manyGenericParams.kt b/testData/ast/typeParameters/statement/manyGenericParams.kt
similarity index 100%
rename from testData/ast/typeParameters/statement_mult/manyGenericParams.kt
rename to testData/ast/typeParameters/statement/manyGenericParams.kt
diff --git a/testData/ast/whileStatement/statement_mult/whileWithBlock.jav b/testData/ast/whileStatement/statement/whileWithBlock.jav
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithBlock.jav
rename to testData/ast/whileStatement/statement/whileWithBlock.jav
diff --git a/testData/ast/whileStatement/statement_mult/whileWithBlock.kt b/testData/ast/whileStatement/statement/whileWithBlock.kt
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithBlock.kt
rename to testData/ast/whileStatement/statement/whileWithBlock.kt
diff --git a/testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.jav b/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.jav
rename to testData/ast/whileStatement/statement/whileWithEmptyBlock.jav
diff --git a/testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.kt b/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithEmptyBlock.kt
rename to testData/ast/whileStatement/statement/whileWithEmptyBlock.kt
diff --git a/testData/ast/whileStatement/statement_mult/whileWithExpression.jav b/testData/ast/whileStatement/statement/whileWithExpression.jav
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithExpression.jav
rename to testData/ast/whileStatement/statement/whileWithExpression.jav
diff --git a/testData/ast/whileStatement/statement_mult/whileWithExpression.kt b/testData/ast/whileStatement/statement/whileWithExpression.kt
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithExpression.kt
rename to testData/ast/whileStatement/statement/whileWithExpression.kt
diff --git a/testData/ast/whileStatement/statement_mult/whileWithReturn.jav b/testData/ast/whileStatement/statement/whileWithReturn.jav
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithReturn.jav
rename to testData/ast/whileStatement/statement/whileWithReturn.jav
diff --git a/testData/ast/whileStatement/statement_mult/whileWithReturn.kt b/testData/ast/whileStatement/statement/whileWithReturn.kt
similarity index 100%
rename from testData/ast/whileStatement/statement_mult/whileWithReturn.kt
rename to testData/ast/whileStatement/statement/whileWithReturn.kt