diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/README.md b/jps/jps-plugin/testData/incremental/cacheVersionChanged/README.md
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/README.md
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/README.md
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java
similarity index 100%
rename from jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java
rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_steps.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_steps.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_steps.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/_steps.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1
diff --git a/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2
rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/dummy.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/dummy.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/dummy.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/dummy.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/fir-build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/fir-build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/fir-build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/dummy.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/dummy.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/dummy.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build-with-scope-expansion.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build-with-scope-expansion.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build-with-scope-expansion.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build-with-scope-expansion.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/dummy.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build-with-scope-expansion.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build-with-scope-expansion.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build-with-scope-expansion.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build-with-scope-expansion.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/DirectInter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/DirectInter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/DirectInter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/DirectInter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/ReverseInter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/ReverseInter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/ReverseInter.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/ReverseInter.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/build.log
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/build.log
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt.new.1
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt.new.1
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt.new.2
rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt.new.2
diff --git a/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java
rename to jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java
diff --git a/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log
rename to jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log
diff --git a/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt
rename to jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt
diff --git a/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java
rename to jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java
diff --git a/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch
rename to jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch
diff --git a/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log
rename to jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log
diff --git a/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt
rename to jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt
diff --git a/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch
rename to jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt
diff --git a/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch
rename to jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log
rename to jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt
rename to jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch
rename to jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt
rename to jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log
rename to jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt
rename to jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt
diff --git a/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch
rename to jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch
diff --git a/jps-plugin/testData/incremental/custom/renameModule/build.log b/jps/jps-plugin/testData/incremental/custom/renameModule/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/custom/renameModule/build.log
rename to jps/jps-plugin/testData/incremental/custom/renameModule/build.log
diff --git a/jps-plugin/testData/incremental/custom/renameModule/test.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/renameModule/test.kt
rename to jps/jps-plugin/testData/incremental/custom/renameModule/test.kt
diff --git a/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/custom/renameModule/test.kt.touch
rename to jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch
diff --git a/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/renameModule/unrelated.kt
rename to jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt
diff --git a/jps-plugin/testData/incremental/custom/renameModule/usage.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/custom/renameModule/usage.kt
rename to jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/Ann.java b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/Ann.java
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/Ann.java
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/Ann.java
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java.new b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/build.log
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/build.log
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/notUsage.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/notUsage.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/notUsage.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/usage.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/usage.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/usage.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java.new b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/build.log
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/build.log
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/notUsage.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/notUsage.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/notUsage.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/test.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/test.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/test.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/test.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/usage.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/usage.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/usage.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/Ann.java b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/Ann.java
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/Ann.java
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/Ann.java
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java.new b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/build.log
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/build.log
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/notUsage.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/notUsage.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/notUsage.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/usage.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/usage.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/usage.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log
diff --git a/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt
rename to jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/function/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/method/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt
diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt
rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt
diff --git a/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/dummy.kt b/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt b/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt
rename to jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt
diff --git a/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt.new
rename to jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt.new
diff --git a/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-build.log b/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-build.log
rename to jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-build.log
diff --git a/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log b/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log
rename to jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log
diff --git a/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/usage.kt b/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/dummy.kt b/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/dummy.kt
rename to jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/dummy.kt
diff --git a/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt b/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt
rename to jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt
diff --git a/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt.new b/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt.new
rename to jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt.new
diff --git a/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-build.log b/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-build.log
rename to jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-build.log
diff --git a/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log b/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log
rename to jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log
diff --git a/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/usage.kt b/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/usage.kt
rename to jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/usage.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt
rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1 b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/simple/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/simple/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/simple/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1 b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/C.java b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/C.java
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/C.java
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/C.java
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/SAMInterface.java b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/SAMInterface.java
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/SAMInterface.java
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/bar/SAMInterface.java
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.touch.1 b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.touch.1
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.touch.1
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/java/bar/C.java b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/bar/C.java
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/java/bar/C.java
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/bar/C.java
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/java/baz/E.java b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/baz/E.java
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/java/baz/E.java
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/baz/E.java
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/java/foo/I.java b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/foo/I.java
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/java/foo/I.java
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/foo/I.java
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/bar.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/bar.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/baz.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/baz.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/baz.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/baz.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt.touch
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt.touch
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/simple/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/simple/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/simple/main.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/JavaClass.java b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/JavaClass.java
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/JavaClass.java
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
diff --git a/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
similarity index 100%
rename from jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
rename to jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/README.md b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/README.md
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/README.md
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/README.md
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
diff --git a/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt
rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt
diff --git a/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
rename to jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
diff --git a/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
rename to jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
diff --git a/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
rename to jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
diff --git a/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
rename to jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
diff --git a/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
rename to jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
diff --git a/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt
similarity index 100%
rename from jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt
rename to jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/README.md b/jps/jps-plugin/testData/incremental/multiModule/common/README.md
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/README.md
rename to jps/jps-plugin/testData/incremental/multiModule/common/README.md
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_B.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_B.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_B.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createB.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createB.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_createB.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_other.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_other.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1 b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_B.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_B.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_B.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createB.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createB.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_createB.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4 b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_other.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_other.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt b/jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/constantValueChanged/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt b/jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt b/jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 b/jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt b/jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch
diff --git a/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt b/jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_dummy.kt b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_dummy.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_dummy.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_dummy.kt b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_dummy.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_dummy.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_useFoo.kt b/jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_useFoo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_useFoo.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_useFoo.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt b/jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simple/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/simple/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simple/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/module1_A.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/module2_AChild.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simple/module2_AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/module2_AChild.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/module2_AChild.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/module2_importA.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simple/module2_importA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/module2_importA.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/module2_importA.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simple/module3_importAChild.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simple/module3_importAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simple/module3_importAChild.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simple/module3_importAChild.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependency/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependency/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_c.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_c.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependency/module2_c.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveDependency/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/twoDependants/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/twoDependants/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/js-jps-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/js-jps-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/twoDependants/js-jps-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/js-jps-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/twoDependants/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/common/twoDependants/module3_c.kt b/jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module3_c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/common/twoDependants/module3_c.kt
rename to jps/jps-plugin/testData/incremental/multiModule/common/twoDependants/module3_c.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/build.log b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_D.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module1_D.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module1_D.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module2_B.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module2_B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module2_B.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module2_B.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module3_C.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module3_C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module3_C.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module3_C.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module4_E.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module4_E.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module4_E.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module4_E.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circular/module5_F.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module5_F.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circular/module5_F.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circular/module5_F.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new
diff --git a/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt
rename to jps/jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/README.md b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/README.md
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/README.md
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/README.md
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_steps.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_steps.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_steps.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/_steps.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_steps.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_steps.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_steps.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_steps.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_a.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_a.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_a.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_b.kt.new.5 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_b.kt.new.5
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_b.kt.new.5
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_b.kt.new.5
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.delete.4 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.delete.4
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.delete.4
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.delete.4
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.new.3 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.new.3
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.new.3
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.new.3
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/_dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/_dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/_dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/init-build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/init-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/init-build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/init-build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJs_f.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJs_f.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJs_f.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJs_f.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJvm_g.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJvm_g.kt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJvm_g.kt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJvm_g.kt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/dependencies.txt
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/dependencies.txt
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/dependencies.txt
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/build.log
diff --git a/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/build.log
rename to jps/jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/addClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addClass/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/addClass/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addClass/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addClass/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/args.txt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/allConstants/args.txt
rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/args.txt
diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/allConstants/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/annotations/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/annotations/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRecreated/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRecreated/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classRemoved/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/C.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/C.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/DoNotUseConstant.kt b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/DoNotUseConstant.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/DoNotUseConstant.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/DoNotUseConstant.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/companionUsage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/companionUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/companionUsage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/companionUsage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/constantUsage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/constantUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/constantUsage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/constantUsage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantRemoved/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantValueChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantValueChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantValueChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantValueChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build-with-scope-expansion.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build-with-scope-expansion.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build-with-scope-expansion.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build-with-scope-expansion.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funRedeclaration/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build-with-scope-expansion.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build-with-scope-expansion.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build-with-scope-expansion.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build-with-scope-expansion.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionBecameInline/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/independentClasses/Bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/independentClasses/Bar.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Bar.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/foo.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/foo.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/directives.txt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/directives.txt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/directives.txt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/directives.txt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/TypeAlias.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/TypeAlias.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/TypeAlias.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/TypeAlias.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/TypeAlias.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/TypeAlias.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/TypeAlias.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/TypeAlias.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveClass/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/js-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/js-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/js-build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/js-build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt b/jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloaded.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt b/jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileAdded/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileAdded/b.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/b.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build-with-scope-expansion.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build-with-scope-expansion.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build-with-scope-expansion.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build-with-scope-expansion.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClass/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameClass/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt
diff --git a/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt b/jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt b/jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt b/jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/b.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt b/jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/serializedSubClassAndChangedInterfaces/interfaces.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/subpackage/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch
rename to jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new
rename to jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new
diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2
rename to jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2
diff --git a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
rename to jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
diff --git a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt
rename to jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt
diff --git a/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
rename to jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
diff --git a/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
rename to jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
diff --git a/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
rename to jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
diff --git a/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
rename to jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
diff --git a/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
rename to jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
diff --git a/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
rename to jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
diff --git a/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new b/jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new
rename to jps/jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
diff --git a/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt
rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/KotlinInterface.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/KotlinInterface.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/KotlinInterface.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/KotlinInterface.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/dummy.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/KotlinUsageClass.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/KotlinUsageClass.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/KotlinUsageClass.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/KotlinUsageClass.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/dummy.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java.new.1 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java.new.1
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java.new.1
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/Dummy.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/Dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/Dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/Dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/useA.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/useA.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/useA.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java.new.1 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java.new.1
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java.new.1
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/Dummy.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/Dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/Dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/Dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java.new.1 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java.new.1
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java.new.1
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/Dummy.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/Dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/Dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/Dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/useA.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/useA.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/useA.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass2.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass2.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass2.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage1.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage1.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage1.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage2.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage2.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage2.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage3.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage3.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage3.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/usage3.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Bar.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Bar.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Bar.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Bar.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/Foo.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/main.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/main.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/main.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/rawErrorTypeDuringSerialization/main.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionExpression.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionExpression.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionExpression.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionExpression.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionLiteral.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionLiteral.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionLiteral.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithMember.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithMember.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithMember.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithMember.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithStatic.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithStatic.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithStatic.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithStatic.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/JavaClass.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/JavaClass.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/JavaClass.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java.new
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java.new
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/build.log
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/build.log
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/notUsage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/notUsage.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/notUsage.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithMember.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithMember.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithMember.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithMember.kt
diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithStatic.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithStatic.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithStatic.kt
rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithStatic.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt b/jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log b/jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt b/jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/A.java b/jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/A.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/A.java
rename to jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/A.java
diff --git a/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/B.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/B.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/B.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/B.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt b/jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt.delete.1 b/jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt.delete.1
rename to jps/jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt.delete.1
diff --git a/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class1.kt b/jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classRedeclaration/class1.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class1.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class2.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classRedeclaration/class2.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/classRedeclaration/class2.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2 b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2
diff --git a/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useJ.kt b/jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useJ.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useJ.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/classToPackageFacade/useJ.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/directives.txt b/jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/directives.txt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/directives.txt
rename to jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/directives.txt
diff --git a/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt b/jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt b/jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt b/jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt b/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java b/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java
rename to jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java
diff --git a/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java b/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java
rename to jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java
diff --git a/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log b/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt b/jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/A.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/AChild.kt b/jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/AChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/jvmNameChanged/AChild.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/AChild.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt b/jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/a.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/b.kt b/jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/mainRedeclaration/b.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/b.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/build.log b/jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/mainRedeclaration/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/mainRedeclaration/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/directives.txt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/directives.txt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/directives.txt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/directives.txt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreated/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/gradle-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/gradle-build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/gradle-build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/dummy.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/dummy.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/dummy.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/dummy.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partA.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partA.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partA.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/optionalParameter/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/optionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/fun.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/optionalParameter/fun.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/fun.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt b/jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt.touch b/jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt.touch
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt.touch
rename to jps/jps-plugin/testData/incremental/withJava/other/optionalParameter/other.kt.touch
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/AA.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/AA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/AA.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/AA.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1 b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1 b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/build.log b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2
rename to jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log b/jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt b/jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt b/jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log b/jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt b/jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log b/jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt b/jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new b/jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new
diff --git a/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt
similarity index 100%
rename from jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt
rename to jps/jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt