diff --git a/compiler/testData/readClass/fun/FunGenericParam.kt b/compiler/testData/readClass/fun/genericWithTypeVariables/FunGenericParam.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunGenericParam.kt
rename to compiler/testData/readClass/fun/genericWithTypeVariables/FunGenericParam.kt
diff --git a/compiler/testData/readClass/fun/FunInParam.kt b/compiler/testData/readClass/fun/genericWithTypeVariables/FunInParam.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunInParam.kt
rename to compiler/testData/readClass/fun/genericWithTypeVariables/FunInParam.kt
diff --git a/compiler/testData/readClass/fun/FunOutParam.kt b/compiler/testData/readClass/fun/genericWithTypeVariables/FunOutParam.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunOutParam.kt
rename to compiler/testData/readClass/fun/genericWithTypeVariables/FunOutParam.kt
diff --git a/compiler/testData/readClass/fun/FunParamUpperClassBound.kt b/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunParamUpperClassBound.kt
rename to compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassBound.kt
diff --git a/compiler/testData/readClass/fun/FunParamUpperClassInterfaceBound.kt b/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunParamUpperClassInterfaceBound.kt
rename to compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt
diff --git a/compiler/testData/readClass/fun/FunParamUpperInterfaceBound.kt b/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunParamUpperInterfaceBound.kt
rename to compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt
diff --git a/compiler/testData/readClass/fun/FunParamUpperInterfaceClassBound.kt b/compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunParamUpperInterfaceClassBound.kt
rename to compiler/testData/readClass/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.kt
diff --git a/compiler/testData/readClass/fun/FunClassParamNotNull.kt b/compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunClassParamNotNull.kt
rename to compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt
diff --git a/compiler/testData/readClass/fun/FunClassParamNullable.kt b/compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunClassParamNullable.kt
rename to compiler/testData/readClass/fun/genericWithoutTypeVariables/FunClassParamNullable.kt
diff --git a/compiler/testData/readClass/fun/FunParamNullable.kt b/compiler/testData/readClass/fun/genericWithoutTypeVariables/FunParamNullable.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunParamNullable.kt
rename to compiler/testData/readClass/fun/genericWithoutTypeVariables/FunParamNullable.kt
diff --git a/compiler/testData/readClass/fun/ReturnTypeClassParamNotNull.kt b/compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ReturnTypeClassParamNotNull.kt
rename to compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt
diff --git a/compiler/testData/readClass/fun/ReturnTypeClassParamNullable.kt b/compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ReturnTypeClassParamNullable.kt
rename to compiler/testData/readClass/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt
diff --git a/compiler/testData/readClass/fun/ClassFun.kt b/compiler/testData/readClass/fun/nonGeneric/ClassFun.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ClassFun.kt
rename to compiler/testData/readClass/fun/nonGeneric/ClassFun.kt
diff --git a/compiler/testData/readClass/fun/ExtFun.kt b/compiler/testData/readClass/fun/nonGeneric/ExtFun.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ExtFun.kt
rename to compiler/testData/readClass/fun/nonGeneric/ExtFun.kt
diff --git a/compiler/testData/readClass/fun/ExtFunInClass.kt b/compiler/testData/readClass/fun/nonGeneric/ExtFunInClass.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ExtFunInClass.kt
rename to compiler/testData/readClass/fun/nonGeneric/ExtFunInClass.kt
diff --git a/compiler/testData/readClass/fun/FunDefaultArg.kt b/compiler/testData/readClass/fun/nonGeneric/FunDefaultArg.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunDefaultArg.kt
rename to compiler/testData/readClass/fun/nonGeneric/FunDefaultArg.kt
diff --git a/compiler/testData/readClass/fun/FunParamNotNull.kt b/compiler/testData/readClass/fun/nonGeneric/FunParamNotNull.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunParamNotNull.kt
rename to compiler/testData/readClass/fun/nonGeneric/FunParamNotNull.kt
diff --git a/compiler/testData/readClass/fun/FunVarargCharSequence.kt b/compiler/testData/readClass/fun/nonGeneric/FunVarargCharSequence.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunVarargCharSequence.kt
rename to compiler/testData/readClass/fun/nonGeneric/FunVarargCharSequence.kt
diff --git a/compiler/testData/readClass/fun/FunVarargInt.kt b/compiler/testData/readClass/fun/nonGeneric/FunVarargInt.kt
similarity index 100%
rename from compiler/testData/readClass/fun/FunVarargInt.kt
rename to compiler/testData/readClass/fun/nonGeneric/FunVarargInt.kt
diff --git a/compiler/testData/readClass/fun/ModifierAbstract.kt b/compiler/testData/readClass/fun/nonGeneric/ModifierAbstract.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ModifierAbstract.kt
rename to compiler/testData/readClass/fun/nonGeneric/ModifierAbstract.kt
diff --git a/compiler/testData/readClass/fun/ModifierOpen.kt b/compiler/testData/readClass/fun/nonGeneric/ModifierOpen.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ModifierOpen.kt
rename to compiler/testData/readClass/fun/nonGeneric/ModifierOpen.kt
diff --git a/compiler/testData/readClass/fun/NsFun.kt b/compiler/testData/readClass/fun/nonGeneric/NsFun.kt
similarity index 100%
rename from compiler/testData/readClass/fun/NsFun.kt
rename to compiler/testData/readClass/fun/nonGeneric/NsFun.kt
diff --git a/compiler/testData/readClass/fun/ReturnTypeNotNull.kt b/compiler/testData/readClass/fun/nonGeneric/ReturnTypeNotNull.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ReturnTypeNotNull.kt
rename to compiler/testData/readClass/fun/nonGeneric/ReturnTypeNotNull.kt
diff --git a/compiler/testData/readClass/fun/ReturnTypeNullable.kt b/compiler/testData/readClass/fun/nonGeneric/ReturnTypeNullable.kt
similarity index 100%
rename from compiler/testData/readClass/fun/ReturnTypeNullable.kt
rename to compiler/testData/readClass/fun/nonGeneric/ReturnTypeNullable.kt