diff --git a/compiler/testData/compileJavaAgainstKotlin/Any.java b/compiler/testData/compileJavaAgainstKotlin/method/Any.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Any.java
rename to compiler/testData/compileJavaAgainstKotlin/method/Any.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/Any.kt b/compiler/testData/compileJavaAgainstKotlin/method/Any.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Any.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/Any.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/ArrayOfIntArray.java b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ArrayOfIntArray.java
rename to compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/ArrayOfIntArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ArrayOfIntArray.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/ArrayOfIntegerArray.java b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ArrayOfIntegerArray.java
rename to compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/ArrayOfIntegerArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ArrayOfIntegerArray.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/GenericArray.java b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/GenericArray.java
rename to compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/GenericArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/GenericArray.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/Hello.java b/compiler/testData/compileJavaAgainstKotlin/method/Hello.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Hello.java
rename to compiler/testData/compileJavaAgainstKotlin/method/Hello.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/Hello.kt b/compiler/testData/compileJavaAgainstKotlin/method/Hello.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Hello.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/Hello.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/Int.java b/compiler/testData/compileJavaAgainstKotlin/method/Int.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Int.java
rename to compiler/testData/compileJavaAgainstKotlin/method/Int.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/Int.kt b/compiler/testData/compileJavaAgainstKotlin/method/Int.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Int.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/Int.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/IntArray.java b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/IntArray.java
rename to compiler/testData/compileJavaAgainstKotlin/method/IntArray.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/IntArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/IntArray.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/IntWithDefault.java b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/IntWithDefault.java
rename to compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/IntWithDefault.kt b/compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/IntWithDefault.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/IntegerArray.java b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/IntegerArray.java
rename to compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/IntegerArray.kt b/compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/IntegerArray.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/ListOfInt.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ListOfInt.java
rename to compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/ListOfInt.kt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ListOfInt.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/ListOfString.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ListOfString.java
rename to compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/ListOfString.kt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ListOfString.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/ListOfT.java b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ListOfT.java
rename to compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/ListOfT.kt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/ListOfT.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/MapOfKString.java b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/MapOfKString.java
rename to compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/MapOfKString.kt b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/MapOfKString.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/MapOfStringIntQ.java b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/MapOfStringIntQ.java
rename to compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/MapOfStringIntQ.kt b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/MapOfStringIntQ.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/Vararg.java b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Vararg.java
rename to compiler/testData/compileJavaAgainstKotlin/method/Vararg.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/Vararg.kt b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Vararg.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt
diff --git a/compiler/testData/compileJavaAgainstKotlin/Void.java b/compiler/testData/compileJavaAgainstKotlin/method/Void.java
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Void.java
rename to compiler/testData/compileJavaAgainstKotlin/method/Void.java
diff --git a/compiler/testData/compileJavaAgainstKotlin/Void.kt b/compiler/testData/compileJavaAgainstKotlin/method/Void.kt
similarity index 100%
rename from compiler/testData/compileJavaAgainstKotlin/Void.kt
rename to compiler/testData/compileJavaAgainstKotlin/method/Void.kt