diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/README.md b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/README.md
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/README.md
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/README.md
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt.touch.1 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt.touch.1
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Y.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Y.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Z.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Z.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/build.log b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/build.log
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonY.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonY.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/dummy.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/X.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/X.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Y.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Y.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Z.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Z.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/build.log b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/build.log
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/dummy.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useXIncompatible.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useXIncompatible.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useYZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt
similarity index 100%
rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useYZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt