diff --git a/jps/testData/incremental/annotations/addAnnotationTarget.log b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget.log
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget.log
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget.log
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/.name
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/A.java.new
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/src/A.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/src/C.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTarget/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTarget/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/src/C2.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue.log b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue.log
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue.log
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue.log
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/.name
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/A.java.new
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/A.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C1.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/src/C2.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2.log b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2.log
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2.log
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2.log
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/.name
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/A.java.new
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/A.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C1.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/src/C2.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue.log b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue.log
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue.log
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue.log
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/.name
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/A.java.new
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/A.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C1.java
diff --git a/jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/src/C2.java
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember.log b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember.log
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember.log
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember.log
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/.name
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/A.java.new
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/A.java
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/C.java
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/C1.java
diff --git a/jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/addDefaultToAnnotationMember/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/src/C2.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy.log b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy.log
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy.log
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy.log
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/.name
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/A.java.new
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/A.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/C.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/C1.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/src/C2.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1.log b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1.log
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1.log
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1.log
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/.name
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/A.java.new
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/A.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/C.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/C1.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy1/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/src/C2.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2.log b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2.log
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2.log
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2.log
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/.name
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/A.java.new
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/A.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/C.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/C1.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/src/C2.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3.log b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3.log
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3.log
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3.log
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/.name
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/A.java.new
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/A.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/C.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/C1.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/src/C2.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4.log b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4.log
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4.log
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4.log
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/.name
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/A.java.new
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/A.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/C.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/C1.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationRetentionPolicy4/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/src/C2.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType.log b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType.log
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType.log
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType.log
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/.name
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/A.java.new
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/A.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/C.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/C1.java
diff --git a/jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/changeAnnotationTypeMemberType/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/src/C2.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental.log b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental.log
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental.log
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental.log
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/.name
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/ant.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/ant.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/ant.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/a1/a1.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a1/a1.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/a1/a1.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a1/a1.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/a1/src/A1.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a1/src/A1.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/a1/src/A1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a1/src/A1.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/a2-src$A2.java.new b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2-src$A2.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/a2-src$A2.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2-src$A2.java.new
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/a2/a2.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/a2.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/a2/a2.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/a2.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/a2/src/A2.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/src/A2.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/a2/src/A2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/src/A2.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/a2/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/a2/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/src/C.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/b21/b21.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b21/b21.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/b21/b21.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b21/b21.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/b21/src/B21.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b21/src/B21.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/b21/src/B21.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b21/src/B21.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/b22/b22.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b22/b22.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/b22/b22.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b22/b22.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/b22/src/B22.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b22/src/B22.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/b22/src/B22.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/b22/src/B22.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/conservativeNonIncremental.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/conservativeNonIncremental.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/conservativeNonIncremental.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/conservativeNonIncremental.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/src/A.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1.log b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1.log
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1.log
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1.log
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/.name
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/a1/a1.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a1/a1.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/a1/a1.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a1/a1.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/a1/src/A1.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a1/src/A1.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/a1/src/A1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a1/src/A1.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/a2-src$A2.java.new b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2-src$A2.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/a2-src$A2.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2-src$A2.java.new
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/a2/a2.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/a2.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/a2/a2.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/a2.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/a2/src/A2.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/src/A2.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/a2/src/A2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/src/A2.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/a2/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/a2/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/src/C.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/b21/b21.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b21/b21.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/b21/b21.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b21/b21.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/b21/src/B21.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b21/src/B21.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/b21/src/B21.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b21/src/B21.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/b22/b22.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b22/b22.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/b22/b22.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b22/b22.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/b22/src/B22.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b22/src/B22.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/b22/src/B22.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/b22/src/B22.java
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/conservativeNonIncremental.iml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/conservativeNonIncremental.iml
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/conservativeNonIncremental.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/conservativeNonIncremental.iml
diff --git a/jps/testData/incremental/annotations/conservativeNonIncremental1/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/conservativeNonIncremental1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/src/A.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged.log b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged.log
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged.log
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged.log
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/.name
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/A1.java.new b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/A1.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/A1.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/A1.java.new
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/A.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/src/A1.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/A1.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/src/A1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/A1.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/C.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChanged/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChanged/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/src/C1.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade.log b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade.log
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade.log
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade.log
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/.name
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/A.java.new
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/A.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/A1.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/A1.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/A1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/A1.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/B.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/B.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/B.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/B.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/C.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/src/C1.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2.log b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2.log
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2.log
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2.log
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/.name
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/A.java.new
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/A.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/A1.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/A1.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/A1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/A1.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/B.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/B.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/B.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/B.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/C.java
diff --git a/jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/metaAnnotationChangedCascade2/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/src/C1.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget.log b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget.log
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget.log
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget.log
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/.name
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/A.java.new
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/src/A.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/src/C.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTarget/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTarget/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/src/C2.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember.log b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember.log
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember.log
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember.log
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/.name
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/A.java.new
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/A.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/C.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/C1.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/src/C2.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1.log b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1.log
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1.log
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1.log
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/.name
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/A.java.new
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/A.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/C.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/C1.java
diff --git a/jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeAnnotationTypeMember1/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/src/C2.java
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember.log b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember.log
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember.log
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember.log
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/.name b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/.name
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/.name
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/vcs.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/workspace.xml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/A.java.new b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/A.java.new
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/A.java.new
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/A.java.new
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/A.java b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/A.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/A.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/A.java
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/C.java b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/C.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/C.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/C.java
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/C1.java b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/C1.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/C1.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/C1.java
diff --git a/jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/C2.java b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/C2.java
similarity index 100%
rename from jps/testData/incremental/annotations/removeDefaultFromAnnotationMember/src/C2.java
rename to java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/src/C2.java
diff --git a/jps/testData/incremental/changeName/changeClassName.log b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName.log
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName.log
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName.log
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/.name b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/.name
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/.name
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/compiler.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/encodings.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/misc.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/modules.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/vcs.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/workspace.xml
diff --git a/jps/testData/incremental/changeName/changeClassName/A.java.remove b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/A.java.remove
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/A.java.remove
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/A.java.remove
diff --git a/jps/testData/incremental/changeName/changeClassName/B.java.new b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/B.java.new
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/B.java.new
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/B.java.new
diff --git a/jps/testData/incremental/changeName/changeClassName/ChangeClassName.iml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/ChangeClassName.iml
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/ChangeClassName.iml
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/ChangeClassName.iml
diff --git a/jps/testData/incremental/changeName/changeClassName/src/A.java b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/src/A.java
similarity index 100%
rename from jps/testData/incremental/changeName/changeClassName/src/A.java
rename to java/java-tests/testData/compileServer/incremental/changeName/changeClassName/src/A.java
diff --git a/jps/testData/incremental/classModifiers/addStatic.log b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic.log
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic.log
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic.log
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/.name b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/.name
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/ant.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/ant.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/ant.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/compiler.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/encodings.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/misc.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/modules.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/vcs.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/workspace.xml
diff --git a/jps/testData/incremental/classModifiers/addStatic/A.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/A.java.new
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/A.java.new
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/A.java.new
diff --git a/jps/testData/incremental/classModifiers/addStatic/AddStatic.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/AddStatic.iml
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/AddStatic.iml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/AddStatic.iml
diff --git a/jps/testData/incremental/classModifiers/addStatic/src/A.java b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/src/A.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/src/A.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/src/A.java
diff --git a/jps/testData/incremental/classModifiers/addStatic/src/B.java b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/src/B.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/src/B.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/src/B.java
diff --git a/jps/testData/incremental/classModifiers/addStatic/src/C.java b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/src/C.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/addStatic/src/C.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/src/C.java
diff --git a/jps/testData/incremental/classModifiers/decAccess.log b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess.log
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess.log
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess.log
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/.name b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/.name
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/compiler.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/encodings.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/misc.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/modules.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/vcs.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/workspace.xml
diff --git a/jps/testData/incremental/classModifiers/decAccess/DecAccess.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/DecAccess.iml
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/DecAccess.iml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/DecAccess.iml
diff --git a/jps/testData/incremental/classModifiers/decAccess/src-impl$Service.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src-impl$Service.java.new
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/src-impl$Service.java.new
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src-impl$Service.java.new
diff --git a/jps/testData/incremental/classModifiers/decAccess/src/impl/Client.java b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src/impl/Client.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/src/impl/Client.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src/impl/Client.java
diff --git a/jps/testData/incremental/classModifiers/decAccess/src/impl/Service.java b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src/impl/Service.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/decAccess/src/impl/Service.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src/impl/Service.java
diff --git a/jps/testData/incremental/classModifiers/dropAbstract.log b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract.log
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract.log
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract.log
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/.name b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/.name
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/compiler.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/encodings.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/misc.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/modules.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/vcs.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/workspace.xml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/A.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/A.java.new
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/A.java.new
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/A.java.new
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/dropAbstract.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/dropAbstract.iml
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/dropAbstract.iml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/dropAbstract.iml
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/src/A.java b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/A.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/src/A.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/A.java
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/src/B.java b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/B.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/src/B.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/B.java
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/src/C.java b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/C.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/src/C.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/C.java
diff --git a/jps/testData/incremental/classModifiers/dropAbstract/src/M.java b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/M.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/dropAbstract/src/M.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/src/M.java
diff --git a/jps/testData/incremental/classModifiers/removeStatic.log b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic.log
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic.log
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic.log
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/.name b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/.name
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/compiler.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/encodings.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/misc.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/modules.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/vcs.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/workspace.xml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/A.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/A.java.new
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/A.java.new
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/A.java.new
diff --git a/jps/testData/incremental/classModifiers/removeStatic/RemoveStatic.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/RemoveStatic.iml
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/RemoveStatic.iml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/RemoveStatic.iml
diff --git a/jps/testData/incremental/classModifiers/removeStatic/src/A.java b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/src/A.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/src/A.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/src/A.java
diff --git a/jps/testData/incremental/classModifiers/removeStatic/src/B.java b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/src/B.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/src/B.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/src/B.java
diff --git a/jps/testData/incremental/classModifiers/removeStatic/src/C.java b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/src/C.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/removeStatic/src/C.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/src/C.java
diff --git a/jps/testData/incremental/classModifiers/setAbstract.log b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract.log
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract.log
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract.log
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/.name b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/.name
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/compiler.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/encodings.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/misc.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/modules.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/vcs.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/workspace.xml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/Service.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/Service.java.new
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/Service.java.new
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/Service.java.new
diff --git a/jps/testData/incremental/classModifiers/setAbstract/SetAbstract.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/SetAbstract.iml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/SetAbstract.iml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/SetAbstract.iml
diff --git a/jps/testData/incremental/classModifiers/setAbstract/src/Client.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/src/Client.java
diff --git a/jps/testData/incremental/classModifiers/setAbstract/src/N.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/src/N.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/src/N.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/src/N.java
diff --git a/jps/testData/incremental/classModifiers/setAbstract/src/Service.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/src/Service.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setAbstract/src/Service.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/src/Service.java
diff --git a/jps/testData/incremental/classModifiers/setFinal.log b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal.log
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal.log
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal.log
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/.name b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/.name
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/compiler.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/encodings.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/misc.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/modules.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/vcs.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/workspace.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal/Service.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/Service.java.new
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/Service.java.new
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/Service.java.new
diff --git a/jps/testData/incremental/classModifiers/setFinal/SetFinal.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/SetFinal.iml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/SetFinal.iml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/SetFinal.iml
diff --git a/jps/testData/incremental/classModifiers/setFinal/src/Service.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/src/Service.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/src/Service.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/src/Service.java
diff --git a/jps/testData/incremental/classModifiers/setFinal/src/SubService.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/src/SubService.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal/src/SubService.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/src/SubService.java
diff --git a/jps/testData/incremental/classModifiers/setFinal1.log b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1.log
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1.log
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1.log
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/.name b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/.name
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/compiler.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/encodings.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/misc.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/modules.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/vcs.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/workspace.xml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/A.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/A.java.new
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/A.java.new
diff --git a/jps/testData/incremental/classModifiers/setFinal1/SetFinal1.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/SetFinal1.iml
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/SetFinal1.iml
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/SetFinal1.iml
diff --git a/jps/testData/incremental/classModifiers/setFinal1/src/A.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/src/A.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/src/A.java
diff --git a/jps/testData/incremental/classModifiers/setFinal1/src/B.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/src/B.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/src/B.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/src/B.java
diff --git a/jps/testData/incremental/classModifiers/setFinal1/src/I.java b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/src/I.java
similarity index 100%
rename from jps/testData/incremental/classModifiers/setFinal1/src/I.java
rename to java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/src/I.java
diff --git a/jps/testData/incremental/classProperties/addExtends.log b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends.log
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends.log
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends.log
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/.name
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/compiler.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/encodings.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/misc.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/modules.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/vcs.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/workspace.xml
diff --git a/jps/testData/incremental/classProperties/addExtends/AddExtends.iml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/AddExtends.iml
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/AddExtends.iml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/AddExtends.iml
diff --git a/jps/testData/incremental/classProperties/addExtends/Super.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/Super.java.new
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/Super.java.new
diff --git a/jps/testData/incremental/classProperties/addExtends/src/Client.java b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Client.java
diff --git a/jps/testData/incremental/classProperties/addExtends/src/Client2.java b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Client2.java
diff --git a/jps/testData/incremental/classProperties/addExtends/src/Client3.java b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Client3.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/src/Client3.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Client3.java
diff --git a/jps/testData/incremental/classProperties/addExtends/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Hyper.java
diff --git a/jps/testData/incremental/classProperties/addExtends/src/Super.java b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Super.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addExtends/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addExtends/src/Super.java
diff --git a/jps/testData/incremental/classProperties/addImplements.log b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements.log
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements.log
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements.log
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/.name
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/compiler.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/encodings.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/misc.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/modules.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/vcs.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/workspace.xml
diff --git a/jps/testData/incremental/classProperties/addImplements/AddImplements.iml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/AddImplements.iml
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/AddImplements.iml
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/AddImplements.iml
diff --git a/jps/testData/incremental/classProperties/addImplements/Super.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/Super.java.new
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/Super.java.new
diff --git a/jps/testData/incremental/classProperties/addImplements/src/Client.java b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Client.java
diff --git a/jps/testData/incremental/classProperties/addImplements/src/Client2.java b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Client2.java
diff --git a/jps/testData/incremental/classProperties/addImplements/src/Client3.java b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Client3.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/src/Client3.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Client3.java
diff --git a/jps/testData/incremental/classProperties/addImplements/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Hyper.java
diff --git a/jps/testData/incremental/classProperties/addImplements/src/Super.java b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Super.java
similarity index 100%
rename from jps/testData/incremental/classProperties/addImplements/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/addImplements/src/Super.java
diff --git a/jps/testData/incremental/classProperties/changeExtends.log b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends.log
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends.log
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends.log
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/.name
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/compiler.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/encodings.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/misc.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/modules.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/vcs.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/workspace.xml
diff --git a/jps/testData/incremental/classProperties/changeExtends/ChangeExtends.iml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/ChangeExtends.iml
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/ChangeExtends.iml
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/ChangeExtends.iml
diff --git a/jps/testData/incremental/classProperties/changeExtends/Super.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/Super.java.new
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/Super.java.new
diff --git a/jps/testData/incremental/classProperties/changeExtends/src/AnotherHyper.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/AnotherHyper.java
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/src/AnotherHyper.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/AnotherHyper.java
diff --git a/jps/testData/incremental/classProperties/changeExtends/src/Client.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Client.java
diff --git a/jps/testData/incremental/classProperties/changeExtends/src/Client2.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Client2.java
diff --git a/jps/testData/incremental/classProperties/changeExtends/src/Client3.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Client3.java
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/src/Client3.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Client3.java
diff --git a/jps/testData/incremental/classProperties/changeExtends/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Hyper.java
diff --git a/jps/testData/incremental/classProperties/changeExtends/src/Super.java b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Super.java
similarity index 100%
rename from jps/testData/incremental/classProperties/changeExtends/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/src/Super.java
diff --git a/jps/testData/incremental/classProperties/removeExtends.log b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends.log
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends.log
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends.log
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/.name
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/compiler.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/encodings.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/misc.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/modules.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/vcs.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/workspace.xml
diff --git a/jps/testData/incremental/classProperties/removeExtends/RemoveExtends.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/RemoveExtends.iml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/RemoveExtends.iml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/RemoveExtends.iml
diff --git a/jps/testData/incremental/classProperties/removeExtends/Super.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/Super.java.new
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/Super.java.new
diff --git a/jps/testData/incremental/classProperties/removeExtends/src/Client.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Client.java
diff --git a/jps/testData/incremental/classProperties/removeExtends/src/Client2.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Client2.java
diff --git a/jps/testData/incremental/classProperties/removeExtends/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Hyper.java
diff --git a/jps/testData/incremental/classProperties/removeExtends/src/Super.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Super.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeExtends/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/src/Super.java
diff --git a/jps/testData/incremental/classProperties/removeImplements.log b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements.log
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements.log
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements.log
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/.name
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/compiler.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/encodings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/misc.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/modules.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/vcs.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/workspace.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements/RemoveImplements.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/RemoveImplements.iml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/RemoveImplements.iml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/RemoveImplements.iml
diff --git a/jps/testData/incremental/classProperties/removeImplements/Super.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/Super.java.new
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/Super.java.new
diff --git a/jps/testData/incremental/classProperties/removeImplements/src/Client.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Client.java
diff --git a/jps/testData/incremental/classProperties/removeImplements/src/Client2.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Client2.java
diff --git a/jps/testData/incremental/classProperties/removeImplements/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Hyper.java
diff --git a/jps/testData/incremental/classProperties/removeImplements/src/Super.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Super.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/src/Super.java
diff --git a/jps/testData/incremental/classProperties/removeImplements2.log b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2.log
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2.log
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2.log
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/.name
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/compiler.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/encodings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/misc.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/modules.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/vcs.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/workspace.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/RemoveImplements2.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/RemoveImplements2.iml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/RemoveImplements2.iml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/RemoveImplements2.iml
diff --git a/jps/testData/incremental/classProperties/removeImplements2/Test.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/Test.java.new
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/Test.java.new
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/Test.java.new
diff --git a/jps/testData/incremental/classProperties/removeImplements2/src/Client.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/src/Client.java
diff --git a/jps/testData/incremental/classProperties/removeImplements2/src/ClientImpl.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/src/ClientImpl.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/src/ClientImpl.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/src/ClientImpl.java
diff --git a/jps/testData/incremental/classProperties/removeImplements2/src/Test.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/src/Test.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements2/src/Test.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/src/Test.java
diff --git a/jps/testData/incremental/classProperties/removeImplements3.log b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3.log
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3.log
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3.log
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/.name b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/.name
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/.name
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/compiler.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/encodings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/misc.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/modules.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/vcs.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/workspace.xml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/RemoveImplements3.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/RemoveImplements3.iml
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/RemoveImplements3.iml
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/RemoveImplements3.iml
diff --git a/jps/testData/incremental/classProperties/removeImplements3/Test.java.new b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/Test.java.new
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/Test.java.new
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/Test.java.new
diff --git a/jps/testData/incremental/classProperties/removeImplements3/src/Client.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/src/Client.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/src/Client.java
diff --git a/jps/testData/incremental/classProperties/removeImplements3/src/ClientImpl.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/src/ClientImpl.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/src/ClientImpl.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/src/ClientImpl.java
diff --git a/jps/testData/incremental/classProperties/removeImplements3/src/Test.java b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/src/Test.java
similarity index 100%
rename from jps/testData/incremental/classProperties/removeImplements3/src/Test.java
rename to java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/src/Test.java
diff --git a/jps/testData/incremental/common/anonymous.log b/java/java-tests/testData/compileServer/incremental/common/anonymous.log
similarity index 100%
rename from jps/testData/incremental/common/anonymous.log
rename to java/java-tests/testData/compileServer/incremental/common/anonymous.log
diff --git a/jps/testData/incremental/common/anonymous/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/.name
diff --git a/jps/testData/incremental/common/anonymous/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/misc.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/modules.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/anonymous/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/anonymous/Anonymous.iml b/java/java-tests/testData/compileServer/incremental/common/anonymous/Anonymous.iml
similarity index 100%
rename from jps/testData/incremental/common/anonymous/Anonymous.iml
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/Anonymous.iml
diff --git a/jps/testData/incremental/common/anonymous/Server.java.new b/java/java-tests/testData/compileServer/incremental/common/anonymous/Server.java.new
similarity index 100%
rename from jps/testData/incremental/common/anonymous/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/Server.java.new
diff --git a/jps/testData/incremental/common/anonymous/src/Client.java b/java/java-tests/testData/compileServer/incremental/common/anonymous/src/Client.java
similarity index 100%
rename from jps/testData/incremental/common/anonymous/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/src/Client.java
diff --git a/jps/testData/incremental/common/anonymous/src/Server.java b/java/java-tests/testData/compileServer/incremental/common/anonymous/src/Server.java
similarity index 100%
rename from jps/testData/incremental/common/anonymous/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/anonymous/src/Server.java
diff --git a/jps/testData/incremental/common/changeDefinitionToClass.log b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass.log
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass.log
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass.log
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/.name
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/misc.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/modules.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/Server.java.new b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/Server.java.new
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/Server.java.new
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/src/Client.java b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/src/Client.java
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/src/Client.java
diff --git a/jps/testData/incremental/common/changeDefinitionToClass/src/Server.java b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/src/Server.java
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/src/Server.java
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2.log b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2.log
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2.log
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2.log
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/.name
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/misc.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/modules.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/Server.java.new b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/Server.java.new
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/Server.java.new
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/src/Client.java b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/src/Client.java
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/src/Client.java
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/src/Factory.java b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/src/Factory.java
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/src/Factory.java
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/src/Factory.java
diff --git a/jps/testData/incremental/common/changeDefinitionToClass2/src/Server.java b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/src/Server.java
similarity index 100%
rename from jps/testData/incremental/common/changeDefinitionToClass2/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/src/Server.java
diff --git a/jps/testData/incremental/common/deleteClass.log b/java/java-tests/testData/compileServer/incremental/common/deleteClass.log
similarity index 100%
rename from jps/testData/incremental/common/deleteClass.log
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass.log
diff --git a/jps/testData/incremental/common/deleteClass/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/.name
diff --git a/jps/testData/incremental/common/deleteClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/misc.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/modules.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/deleteClass/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/deleteClass/DeleteClass.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/DeleteClass.iml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/DeleteClass.iml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/DeleteClass.iml
diff --git a/jps/testData/incremental/common/deleteClass/src-packageA$Server.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClass/src-packageA$Server.java.remove
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/src-packageA$Server.java.remove
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/src-packageA$Server.java.remove
diff --git a/jps/testData/incremental/common/deleteClass/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/src/packageA/Client.java
diff --git a/jps/testData/incremental/common/deleteClass/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClass/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/src/packageA/Server.java
diff --git a/jps/testData/incremental/common/deleteClass1.log b/java/java-tests/testData/compileServer/incremental/common/deleteClass1.log
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1.log
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1.log
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/.name
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/misc.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/modules.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/deleteClass1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/deleteClass1/DeleteClass1.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/DeleteClass1.iml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/DeleteClass1.iml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/DeleteClass1.iml
diff --git a/jps/testData/incremental/common/deleteClass1/src-packageA$Server.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/src-packageA$Server.java.remove
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/src-packageA$Server.java.remove
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/src-packageA$Server.java.remove
diff --git a/jps/testData/incremental/common/deleteClass1/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/src/packageA/Client.java
diff --git a/jps/testData/incremental/common/deleteClass1/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClass1/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/src/packageA/Server.java
diff --git a/jps/testData/incremental/common/deleteClass2.log b/java/java-tests/testData/compileServer/incremental/common/deleteClass2.log
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2.log
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2.log
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/.name
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/misc.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/modules.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/deleteClass2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/deleteClass2/DeleteClass2.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/DeleteClass2.iml
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/DeleteClass2.iml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/DeleteClass2.iml
diff --git a/jps/testData/incremental/common/deleteClass2/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/src-packageA$Server.java.new
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/src-packageA$Server.java.new
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/src-packageA$Server.java.new
diff --git a/jps/testData/incremental/common/deleteClass2/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/src/packageA/Client.java
diff --git a/jps/testData/incremental/common/deleteClass2/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClass2/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/src/packageA/Server.java
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot.log b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot.log
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot.log
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot.log
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/.name
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/data.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/data.xml
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/data.xml
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/data.xml
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/src-packageA$Server.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src-packageA$Server.java.remove
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/src-packageA$Server.java.remove
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src-packageA$Server.java.remove
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Client.java
diff --git a/jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Server.java
diff --git a/jps/testData/incremental/common/dependencyUpdate.log b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate.log
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate.log
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate.log
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/.name
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/misc.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/modules.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/dependencyUpdate/A.java.new b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/A.java.new
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/A.java.new
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/A.java.new
diff --git a/jps/testData/incremental/common/dependencyUpdate/DependencyUpdate.iml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/DependencyUpdate.iml
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/DependencyUpdate.iml
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/DependencyUpdate.iml
diff --git a/jps/testData/incremental/common/dependencyUpdate/E.java.new b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/E.java.new
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/E.java.new
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/E.java.new
diff --git a/jps/testData/incremental/common/dependencyUpdate/src/A.java b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/src/A.java
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/src/A.java
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/src/A.java
diff --git a/jps/testData/incremental/common/dependencyUpdate/src/B.java b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/src/B.java
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/src/B.java
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/src/B.java
diff --git a/jps/testData/incremental/common/dependencyUpdate/src/E.java b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/src/E.java
similarity index 100%
rename from jps/testData/incremental/common/dependencyUpdate/src/E.java
rename to java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/src/E.java
diff --git a/jps/testData/incremental/common/inner.log b/java/java-tests/testData/compileServer/incremental/common/inner.log
similarity index 100%
rename from jps/testData/incremental/common/inner.log
rename to java/java-tests/testData/compileServer/incremental/common/inner.log
diff --git a/jps/testData/incremental/common/inner/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/.name
diff --git a/jps/testData/incremental/common/inner/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/inner/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/inner/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/inner/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/misc.xml
diff --git a/jps/testData/incremental/common/inner/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/modules.xml
diff --git a/jps/testData/incremental/common/inner/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/inner/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/inner/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/inner/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/inner/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/inner/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/inner/Inner.iml b/java/java-tests/testData/compileServer/incremental/common/inner/Inner.iml
similarity index 100%
rename from jps/testData/incremental/common/inner/Inner.iml
rename to java/java-tests/testData/compileServer/incremental/common/inner/Inner.iml
diff --git a/jps/testData/incremental/common/inner/Server.java.new b/java/java-tests/testData/compileServer/incremental/common/inner/Server.java.new
similarity index 100%
rename from jps/testData/incremental/common/inner/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/common/inner/Server.java.new
diff --git a/jps/testData/incremental/common/inner/src/Client.java b/java/java-tests/testData/compileServer/incremental/common/inner/src/Client.java
similarity index 100%
rename from jps/testData/incremental/common/inner/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/common/inner/src/Client.java
diff --git a/jps/testData/incremental/common/inner/src/Server.java b/java/java-tests/testData/compileServer/incremental/common/inner/src/Server.java
similarity index 100%
rename from jps/testData/incremental/common/inner/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/common/inner/src/Server.java
diff --git a/jps/testData/incremental/common/noResourceDelete.log b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete.log
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete.log
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete.log
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/.name
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/misc.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/modules.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/noResourceDelete/NoResourceDelete.iml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/NoResourceDelete.iml
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/NoResourceDelete.iml
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/NoResourceDelete.iml
diff --git a/jps/testData/incremental/common/noResourceDelete/src/com/ttt.properties b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/src/com/ttt.properties
similarity index 100%
rename from jps/testData/incremental/common/noResourceDelete/src/com/ttt.properties
rename to java/java-tests/testData/compileServer/incremental/common/noResourceDelete/src/com/ttt.properties
diff --git a/jps/testData/incremental/common/noSecondFileCompile.log b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile.log
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile.log
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile.log
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/.name
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/misc.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/modules.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/A.java.new b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/A.java.new
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/A.java.new
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/A.java.new
diff --git a/jps/testData/incremental/common/noSecondFileCompile/C.java.new b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/C.java.new
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/C.java.new
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/C.java.new
diff --git a/jps/testData/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml
diff --git a/jps/testData/incremental/common/noSecondFileCompile/src/A.java b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/src/A.java
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/src/A.java
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/src/A.java
diff --git a/jps/testData/incremental/common/noSecondFileCompile/src/C.java b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/src/C.java
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile/src/C.java
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/src/C.java
diff --git a/jps/testData/incremental/common/noSecondFileCompile1.log b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1.log
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1.log
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1.log
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/.name b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/.name
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/compiler.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/encodings.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/misc.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/modules.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/vcs.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/workspace.xml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/A.java.new b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/A.java.new
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/A.java.new
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/C.java.new b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/C.java.new
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/C.java.new
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/C.java.new
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/src/A.java b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/src/A.java
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/src/A.java
diff --git a/jps/testData/incremental/common/noSecondFileCompile1/src/C.java b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/src/C.java
similarity index 100%
rename from jps/testData/incremental/common/noSecondFileCompile1/src/C.java
rename to java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/src/C.java
diff --git a/jps/testData/incremental/compilePackage/synchronizeOutput/a/A.java b/java/java-tests/testData/compileServer/incremental/compilePackage/synchronizeOutput/a/A.java
similarity index 100%
rename from jps/testData/incremental/compilePackage/synchronizeOutput/a/A.java
rename to java/java-tests/testData/compileServer/incremental/compilePackage/synchronizeOutput/a/A.java
diff --git a/jps/testData/incremental/compilePackage/synchronizeOutput/ab/B.java b/java/java-tests/testData/compileServer/incremental/compilePackage/synchronizeOutput/ab/B.java
similarity index 100%
rename from jps/testData/incremental/compilePackage/synchronizeOutput/ab/B.java
rename to java/java-tests/testData/compileServer/incremental/compilePackage/synchronizeOutput/ab/B.java
diff --git a/jps/testData/incremental/compilePackage/synchronizeOutput/data.xml b/java/java-tests/testData/compileServer/incremental/compilePackage/synchronizeOutput/data.xml
similarity index 100%
rename from jps/testData/incremental/compilePackage/synchronizeOutput/data.xml
rename to java/java-tests/testData/compileServer/incremental/compilePackage/synchronizeOutput/data.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal.log
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal.log
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal.log
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/.name
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/Base.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/Base.java.new
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/Base.java.new
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/SetFinal.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/SetFinal.iml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/SetFinal.iml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/SetFinal.iml
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/src/Base.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Base.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Base.java
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/src/Client1.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Client1.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/src/Client1.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Client1.java
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/src/Client2.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Client2.java
diff --git a/jps/testData/incremental/fieldModifiers/setFinal/src/Client3.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Client3.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setFinal/src/Client3.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/src/Client3.java
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate.log
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate.log
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate.log
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/.name
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/A.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/A.java.new
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/SetPrivate.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/SetPrivate.iml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/SetPrivate.iml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/SetPrivate.iml
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/src/A.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/src/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/src/A.java
diff --git a/jps/testData/incremental/fieldModifiers/setPrivate/src/B.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/src/B.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setPrivate/src/B.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/src/B.java
diff --git a/jps/testData/incremental/fieldModifiers/setProtected.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected.log
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected.log
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected.log
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/.name
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/A.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/A.java.new
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/SetProtected.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/SetProtected.iml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/SetProtected.iml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/SetProtected.iml
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/src/A.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/src/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/src/A.java
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/src/B.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/src/B.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/src/B.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/src/B.java
diff --git a/jps/testData/incremental/fieldModifiers/setProtected/src/C.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/src/C.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setProtected/src/C.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/src/C.java
diff --git a/jps/testData/incremental/fieldModifiers/setStatic.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic.log
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic.log
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic.log
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/.name
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/Base.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/Base.java.new
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/Base.java.new
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/SetStatic.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/SetStatic.iml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/SetStatic.iml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/SetStatic.iml
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/src/Base.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/src/Base.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/src/Base.java
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/src/Client1.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/src/Client1.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/src/Client1.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/src/Client1.java
diff --git a/jps/testData/incremental/fieldModifiers/setStatic/src/Client2.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/setStatic/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/src/Client2.java
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic.log
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic.log
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic.log
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/.name
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/Base.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/Base.java.new
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/Base.java.new
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/src/Base.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/src/Base.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/src/Base.java
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/src/Client1.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/src/Client1.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/src/Client1.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/src/Client1.java
diff --git a/jps/testData/incremental/fieldModifiers/unsetStatic/src/Client2.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStatic/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/src/Client2.java
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal.log
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal.log
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal.log
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/.name
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/Server.java.new
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/src/Client.java
diff --git a/jps/testData/incremental/fieldModifiers/unsetStaticFinal/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldModifiers/unsetStaticFinal/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain.log
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/ConstantChain.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/ConstantChain.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/ConstantChain.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/ConstantChain.iml
diff --git a/jps/testData/incremental/fieldProperties/constantChain/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/constantChain/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain/src/ServerClient.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/src/ServerClient.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain/src/ServerClient.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/src/ServerClient.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain1.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1.log
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/A.java.new
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/ConstantChain1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/ConstantChain1.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/ConstantChain1.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/ConstantChain1.iml
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/A.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/A.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/src/B.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/B.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/src/B.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/B.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/src/C.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/C.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/src/C.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/C.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain1/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain2.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2.log
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/Client.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/Client.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/Client.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/Client.java.new
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/Const1.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/Const1.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/Const1.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/Const1.java.new
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/ConstantChain2.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/ConstantChain2.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/ConstantChain2.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/ConstantChain2.iml
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/src/Const1.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/src/Const1.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/src/Const1.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/src/Const1.java
diff --git a/jps/testData/incremental/fieldProperties/constantChain2/src/Const2.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/src/Const2.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantChain2/src/Const2.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/src/Const2.java
diff --git a/jps/testData/incremental/fieldProperties/constantRemove.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove.log
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/ConstantRemove.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/ConstantRemove.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/ConstantRemove.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/ConstantRemove.iml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/constantRemove/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1.log
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/src/A.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/src/A.java
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/constantRemove1/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/constantRemove1/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange.log
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/doubleConstantChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/doubleConstantChange/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange.log
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/floatConstantChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/floatConstantChange/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange.log
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/innerConstantChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/innerConstantChange/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange.log
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/IntConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/IntConstantChange.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/IntConstantChange.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/IntConstantChange.iml
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/intConstantChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/intConstantChange/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange.log
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/LongConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/LongConstantChange.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/LongConstantChange.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/LongConstantChange.iml
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/longConstantChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/longConstantChange/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant.log
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/Test.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/Test.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/Test.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/Test.java.new
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/nonCompileTimeConstant/src/Test.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/src/Test.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonCompileTimeConstant/src/Test.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/src/Test.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1.log
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src-A$A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src-A$A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/src-A$A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src-A$A.java.new
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/A/A.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/src/A/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/A/A.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/C.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/A/C.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/src/A/C.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/A/C.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src/B/M.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/B/M.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental1/src/B/M.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/B/M.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2.log
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src-A$A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src-A$A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/src-A$A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src-A$A.java.new
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/A/A.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/src/A/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/A/A.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/C.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/A/C.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/src/A/C.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/A/C.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src/B/M.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/B/M.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/src/B/M.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/B/M.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src/B/N.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/B/N.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental2/src/B/N.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/B/N.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental3/src-A$A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src-A$A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental3/src-A$A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src-A$A.java.new
diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/A/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/A/A.java
new file mode 100644
index 000000000000..2d38a07a9509
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/A/A.java
@@ -0,0 +1,12 @@
+package A;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: db
+ * Date: 23.01.12
+ * Time: 13:51
+ * To change this template use File | Settings | File Templates.
+ */
+public class A {
+    final static int x = 1024;
+}
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental3/src/A/C.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/A/C.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental3/src/A/C.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/A/C.java
diff --git a/jps/testData/incremental/fieldProperties/nonIncremental3/src/B/M.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/B/M.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/nonIncremental3/src/B/M.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/B/M.java
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange.log
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/stringConstantChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantChange/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible.log
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/Server.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/Server.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/Server.java.new
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/src/Client.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/src/Client.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/src/Client.java
diff --git a/jps/testData/incremental/fieldProperties/stringConstantLessAccessible/src/Server.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/src/Server.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/stringConstantLessAccessible/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/src/Server.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange.log
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/A.java.new
diff --git a/jps/testData/incremental/fieldProperties/typeChange/TypeChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/TypeChange.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/TypeChange.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/TypeChange.iml
diff --git a/jps/testData/incremental/fieldProperties/typeChange/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/src/A.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/src/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/src/A.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange/src/B.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/src/B.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange/src/B.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/src/B.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange1.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1.log
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/A.java.new
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/TypeChange1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/TypeChange1.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/TypeChange1.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/TypeChange1.iml
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/A.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/A.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/src/B.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/B.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/src/B.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/B.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/src/C.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/C.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/src/C.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/C.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange1/src/D.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/D.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange1/src/D.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/src/D.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange2.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2.log
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2.log
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2.log
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/.name b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/.name
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/compiler.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/encodings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/misc.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/modules.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/vcs.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/workspace.xml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/A.java.new
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/A.java.new
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/A.java.new
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/TypeChange2.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/TypeChange2.iml
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/TypeChange2.iml
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/TypeChange2.iml
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/A.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/src/A.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/A.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/src/B.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/B.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/src/B.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/B.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/src/C.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/C.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/src/C.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/C.java
diff --git a/jps/testData/incremental/fieldProperties/typeChange2/src/D.java b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/D.java
similarity index 100%
rename from jps/testData/incremental/fieldProperties/typeChange2/src/D.java
rename to java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/src/D.java
diff --git a/jps/testData/incremental/generics/addMethodToBase.log b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase.log
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase.log
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase.log
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/.name
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/AddMethodToBase.iml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/AddMethodToBase.iml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/AddMethodToBase.iml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/AddMethodToBase.iml
diff --git a/jps/testData/incremental/generics/addMethodToBase/C.java.new b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/C.java.new
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/C.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/C.java.new
diff --git a/jps/testData/incremental/generics/addMethodToBase/data.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/data.xml
diff --git a/jps/testData/incremental/generics/addMethodToBase/src/C.java b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/src/C.java
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/src/C.java
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/src/C.java
diff --git a/jps/testData/incremental/generics/addMethodToBase/src/D.java b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/src/D.java
similarity index 100%
rename from jps/testData/incremental/generics/addMethodToBase/src/D.java
rename to java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/src/D.java
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase.log b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase.log
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase.log
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase.log
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/.name
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/C.java.new b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/C.java.new
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/C.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/C.java.new
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/data.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/data.xml
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/src/C.java b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/src/C.java
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/src/C.java
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/src/C.java
diff --git a/jps/testData/incremental/generics/addParameterizedMethodToBase/src/D.java b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/src/D.java
similarity index 100%
rename from jps/testData/incremental/generics/addParameterizedMethodToBase/src/D.java
rename to java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/src/D.java
diff --git a/jps/testData/incremental/generics/changeBound.log b/java/java-tests/testData/compileServer/incremental/generics/changeBound.log
similarity index 100%
rename from jps/testData/incremental/generics/changeBound.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound.log
diff --git a/jps/testData/incremental/generics/changeBound/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/.name
diff --git a/jps/testData/incremental/generics/changeBound/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeBound/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeBound/A.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeBound/A.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/A.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/A.java.new
diff --git a/jps/testData/incremental/generics/changeBound/ChangeBound.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/ChangeBound.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/ChangeBound.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/ChangeBound.iml
diff --git a/jps/testData/incremental/generics/changeBound/src/A.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound/src/A.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/src/A.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/src/A.java
diff --git a/jps/testData/incremental/generics/changeBound/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/src/Client.java
diff --git a/jps/testData/incremental/generics/changeBound/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/src/Value.java
diff --git a/jps/testData/incremental/generics/changeBound/src/ValueImpl.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound/src/ValueImpl.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound/src/ValueImpl.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound/src/ValueImpl.java
diff --git a/jps/testData/incremental/generics/changeBound1.log b/java/java-tests/testData/compileServer/incremental/generics/changeBound1.log
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1.log
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/.name
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeBound1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeBound1/A.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/A.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/A.java.new
diff --git a/jps/testData/incremental/generics/changeBound1/ChangeBound1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/ChangeBound1.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/ChangeBound1.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/ChangeBound1.iml
diff --git a/jps/testData/incremental/generics/changeBound1/src/A.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/A.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/A.java
diff --git a/jps/testData/incremental/generics/changeBound1/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/Client.java
diff --git a/jps/testData/incremental/generics/changeBound1/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/Value.java
diff --git a/jps/testData/incremental/generics/changeBound1/src/ValueImpl.java b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/ValueImpl.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBound1/src/ValueImpl.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBound1/src/ValueImpl.java
diff --git a/jps/testData/incremental/generics/changeBoundClass1.log b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1.log
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1.log
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/.name
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml
diff --git a/jps/testData/incremental/generics/changeBoundClass1/Value.java.remove b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/Value.java.remove
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/Value.java.remove
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/Value.java.remove
diff --git a/jps/testData/incremental/generics/changeBoundClass1/src/A.java b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/src/A.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/src/A.java
diff --git a/jps/testData/incremental/generics/changeBoundClass1/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundClass1/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/src/Value.java
diff --git a/jps/testData/incremental/generics/changeBoundInterface1.log b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1.log
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1.log
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/.name
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/I.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/I.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/I.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/I.java.new
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/src/A.java b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/src/A.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/src/A.java
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/src/I.java b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/src/I.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/src/I.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/src/I.java
diff --git a/jps/testData/incremental/generics/changeBoundInterface1/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundInterface1/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/src/Value.java
diff --git a/jps/testData/incremental/generics/changeBoundedClass.log b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass.log
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass.log
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/.name
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml
diff --git a/jps/testData/incremental/generics/changeBoundedClass/Value.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/Value.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/Value.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/Value.java.new
diff --git a/jps/testData/incremental/generics/changeBoundedClass/src/A.java b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/src/A.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/src/A.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/src/A.java
diff --git a/jps/testData/incremental/generics/changeBoundedClass/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/changeBoundedClass/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/src/Value.java
diff --git a/jps/testData/incremental/generics/changeExtends.log b/java/java-tests/testData/compileServer/incremental/generics/changeExtends.log
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends.log
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/.name
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeExtends/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeExtends/ChangeExtends.iml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/ChangeExtends.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/ChangeExtends.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/ChangeExtends.iml
diff --git a/jps/testData/incremental/generics/changeExtends/Super.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/Super.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/Super.java.new
diff --git a/jps/testData/incremental/generics/changeExtends/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Client.java
diff --git a/jps/testData/incremental/generics/changeExtends/src/Client2.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Client2.java
diff --git a/jps/testData/incremental/generics/changeExtends/src/Client3.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Client3.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/src/Client3.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Client3.java
diff --git a/jps/testData/incremental/generics/changeExtends/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Hyper.java
diff --git a/jps/testData/incremental/generics/changeExtends/src/Super.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Super.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends/src/Super.java
diff --git a/jps/testData/incremental/generics/changeExtends1.log b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1.log
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1.log
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/.name
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeExtends1/ChangeExtends1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/ChangeExtends1.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/ChangeExtends1.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/ChangeExtends1.iml
diff --git a/jps/testData/incremental/generics/changeExtends1/Super.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/Super.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/Super.java.new
diff --git a/jps/testData/incremental/generics/changeExtends1/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Client.java
diff --git a/jps/testData/incremental/generics/changeExtends1/src/Client2.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Client2.java
diff --git a/jps/testData/incremental/generics/changeExtends1/src/Client3.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Client3.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/src/Client3.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Client3.java
diff --git a/jps/testData/incremental/generics/changeExtends1/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Hyper.java
diff --git a/jps/testData/incremental/generics/changeExtends1/src/Super.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Super.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends1/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends1/src/Super.java
diff --git a/jps/testData/incremental/generics/changeExtends2.log b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2.log
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2.log
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/.name
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeExtends2/ChangeExtends2.iml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/ChangeExtends2.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/ChangeExtends2.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/ChangeExtends2.iml
diff --git a/jps/testData/incremental/generics/changeExtends2/Super.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/Super.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/Super.java.new
diff --git a/jps/testData/incremental/generics/changeExtends2/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/src/Client.java
diff --git a/jps/testData/incremental/generics/changeExtends2/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/src/Hyper.java
diff --git a/jps/testData/incremental/generics/changeExtends2/src/Super.java b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/src/Super.java
similarity index 100%
rename from jps/testData/incremental/generics/changeExtends2/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeExtends2/src/Super.java
diff --git a/jps/testData/incremental/generics/changeImplements.log b/java/java-tests/testData/compileServer/incremental/generics/changeImplements.log
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements.log
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/.name
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeImplements/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeImplements/ChangeImplements.iml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/ChangeImplements.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/ChangeImplements.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/ChangeImplements.iml
diff --git a/jps/testData/incremental/generics/changeImplements/Super.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/Super.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/Super.java.new
diff --git a/jps/testData/incremental/generics/changeImplements/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Client.java
diff --git a/jps/testData/incremental/generics/changeImplements/src/Client2.java b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Client2.java
diff --git a/jps/testData/incremental/generics/changeImplements/src/Client3.java b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Client3.java
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/src/Client3.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Client3.java
diff --git a/jps/testData/incremental/generics/changeImplements/src/Hyper.java b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Hyper.java
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/src/Hyper.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Hyper.java
diff --git a/jps/testData/incremental/generics/changeImplements/src/Super.java b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Super.java
similarity index 100%
rename from jps/testData/incremental/generics/changeImplements/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeImplements/src/Super.java
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter.log b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter.log
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter.log
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/.name
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/B.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/B.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/B.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/B.java.new
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/src/B.java b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/src/B.java
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/src/B.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/src/B.java
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/src/C.java b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/src/C.java
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/src/C.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/src/C.java
diff --git a/jps/testData/incremental/generics/changeInterfaceTypeParameter/src/I.java b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/src/I.java
similarity index 100%
rename from jps/testData/incremental/generics/changeInterfaceTypeParameter/src/I.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/src/I.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase.log b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase.log
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase.log
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/.name
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/data.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/data.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/src-maketest$BaseImplementation.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src-maketest$BaseImplementation.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/src-maketest$BaseImplementation.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src-maketest$BaseImplementation.java.new
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/BaseImplementation.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/BaseImplementation.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/BaseImplementation.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/BaseImplementation.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/Data.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/Data.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/Data.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/Data.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/DataEx.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/DataEx.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/DataEx.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/DataEx.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/I.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/I.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/I.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/I.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/IImpl.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/IImpl.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/IImpl.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/IImpl.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/Main.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/Main.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase/src/maketest/Main.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/Main.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2.log b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2.log
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2.log
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/.name
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/data.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/data.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src-maketest$BaseImplementation.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src-maketest$BaseImplementation.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src-maketest$BaseImplementation.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src-maketest$BaseImplementation.java.new
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/BaseImplementation.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/BaseImplementation.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/BaseImplementation.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/BaseImplementation.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Data.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Data.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Data.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Data.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/DataEx.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/DataEx.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/DataEx.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/DataEx.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/I.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/I.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/I.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/I.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/IImpl.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/IImpl.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/IImpl.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/IImpl.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/J.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/J.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/J.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/J.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Main.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Main.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Main.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/Main.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/.name
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/data.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/data.xml
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/BaseImplementation.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/BaseImplementation.class
new file mode 100644
index 000000000000..139833475979
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/BaseImplementation.class differ
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Data.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Data.class
new file mode 100644
index 000000000000..42e07d6bb986
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Data.class differ
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/DataEx.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/DataEx.class
new file mode 100644
index 000000000000..59f0bdda54fc
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/DataEx.class differ
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/I.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/I.class
new file mode 100644
index 000000000000..bc7d455b88dd
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/I.class differ
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/IImpl.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/IImpl.class
new file mode 100644
index 000000000000..437989ce512a
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/IImpl.class differ
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/J.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/J.class
new file mode 100644
index 000000000000..e3b30c810f55
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/J.class differ
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Main.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Main.class
new file mode 100644
index 000000000000..125ad6cd5bcf
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Main.class differ
diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Mediator.class b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Mediator.class
new file mode 100644
index 000000000000..6e47b226c851
Binary files /dev/null and b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/out/production/ChangeToCovariantMethodInBase3/maketest/Mediator.class differ
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src-maketest$BaseImplementation.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src-maketest$BaseImplementation.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src-maketest$BaseImplementation.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src-maketest$BaseImplementation.java.new
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/BaseImplementation.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/BaseImplementation.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/BaseImplementation.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/BaseImplementation.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Data.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Data.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Data.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Data.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/DataEx.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/DataEx.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/DataEx.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/DataEx.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/I.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/I.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/I.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/I.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/IImpl.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/IImpl.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/IImpl.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/IImpl.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/J.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/J.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/J.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/J.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Main.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Main.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Main.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Main.java
diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Mediator.java b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Mediator.java
similarity index 100%
rename from jps/testData/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Mediator.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/Mediator.java
diff --git a/jps/testData/incremental/generics/changeVarargSignature.log b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature.log
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature.log
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/.name
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/data.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/data.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src-packageA$Base.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/src-packageA$Base.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src-packageA$Base.java.new
diff --git a/jps/testData/incremental/generics/changeVarargSignature/src/packageA/Base.java b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src/packageA/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/src/packageA/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src/packageA/Base.java
diff --git a/jps/testData/incremental/generics/changeVarargSignature/src/packageA/Derived.java b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src/packageA/Derived.java
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature/src/packageA/Derived.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src/packageA/Derived.java
diff --git a/jps/testData/incremental/generics/changeVarargSignature1.log b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1.log
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1.log
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1.log
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/.name
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/data.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/data.xml
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src-packageA$Base.java.new
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/src-packageA$Base.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src-packageA$Base.java.new
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/src/packageA/Base.java b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src/packageA/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/src/packageA/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src/packageA/Base.java
diff --git a/jps/testData/incremental/generics/changeVarargSignature1/src/packageA/Deri$ved.java b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src/packageA/Deri$ved.java
similarity index 100%
rename from jps/testData/incremental/generics/changeVarargSignature1/src/packageA/Deri$ved.java
rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src/packageA/Deri$ved.java
diff --git a/jps/testData/incremental/generics/covariance.log b/java/java-tests/testData/compileServer/incremental/generics/covariance.log
similarity index 100%
rename from jps/testData/incremental/generics/covariance.log
rename to java/java-tests/testData/compileServer/incremental/generics/covariance.log
diff --git a/jps/testData/incremental/generics/covariance/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/.name
diff --git a/jps/testData/incremental/generics/covariance/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/covariance/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/covariance/Covariance.iml b/java/java-tests/testData/compileServer/incremental/generics/covariance/Covariance.iml
similarity index 100%
rename from jps/testData/incremental/generics/covariance/Covariance.iml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/Covariance.iml
diff --git a/jps/testData/incremental/generics/covariance/Derived.java.new b/java/java-tests/testData/compileServer/incremental/generics/covariance/Derived.java.new
similarity index 100%
rename from jps/testData/incremental/generics/covariance/Derived.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/Derived.java.new
diff --git a/jps/testData/incremental/generics/covariance/src/Base.java b/java/java-tests/testData/compileServer/incremental/generics/covariance/src/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/src/Base.java
diff --git a/jps/testData/incremental/generics/covariance/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/covariance/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/src/Client.java
diff --git a/jps/testData/incremental/generics/covariance/src/Derived.java b/java/java-tests/testData/compileServer/incremental/generics/covariance/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/src/Derived.java
diff --git a/jps/testData/incremental/generics/covariance/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/covariance/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/src/Value.java
diff --git a/jps/testData/incremental/generics/covariance/src/ValueDerived.java b/java/java-tests/testData/compileServer/incremental/generics/covariance/src/ValueDerived.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance/src/ValueDerived.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance/src/ValueDerived.java
diff --git a/jps/testData/incremental/generics/covariance1.log b/java/java-tests/testData/compileServer/incremental/generics/covariance1.log
similarity index 100%
rename from jps/testData/incremental/generics/covariance1.log
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1.log
diff --git a/jps/testData/incremental/generics/covariance1/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/.name
diff --git a/jps/testData/incremental/generics/covariance1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/covariance1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/covariance1/Covariance1.iml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/Covariance1.iml
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/Covariance1.iml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/Covariance1.iml
diff --git a/jps/testData/incremental/generics/covariance1/Derived.java.new b/java/java-tests/testData/compileServer/incremental/generics/covariance1/Derived.java.new
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/Derived.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/Derived.java.new
diff --git a/jps/testData/incremental/generics/covariance1/src/Base.java b/java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Base.java
diff --git a/jps/testData/incremental/generics/covariance1/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Client.java
diff --git a/jps/testData/incremental/generics/covariance1/src/Derived.java b/java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Derived.java
diff --git a/jps/testData/incremental/generics/covariance1/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/src/Value.java
diff --git a/jps/testData/incremental/generics/covariance1/src/ValueDerived.java b/java/java-tests/testData/compileServer/incremental/generics/covariance1/src/ValueDerived.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance1/src/ValueDerived.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance1/src/ValueDerived.java
diff --git a/jps/testData/incremental/generics/covariance2.log b/java/java-tests/testData/compileServer/incremental/generics/covariance2.log
similarity index 100%
rename from jps/testData/incremental/generics/covariance2.log
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2.log
diff --git a/jps/testData/incremental/generics/covariance2/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/.name
diff --git a/jps/testData/incremental/generics/covariance2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/covariance2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/covariance2/Covariance2.iml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/Covariance2.iml
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/Covariance2.iml
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/Covariance2.iml
diff --git a/jps/testData/incremental/generics/covariance2/IfaceImpl.java.new b/java/java-tests/testData/compileServer/incremental/generics/covariance2/IfaceImpl.java.new
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/IfaceImpl.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/IfaceImpl.java.new
diff --git a/jps/testData/incremental/generics/covariance2/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/covariance2/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/src/Client.java
diff --git a/jps/testData/incremental/generics/covariance2/src/Iface.java b/java/java-tests/testData/compileServer/incremental/generics/covariance2/src/Iface.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/src/Iface.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/src/Iface.java
diff --git a/jps/testData/incremental/generics/covariance2/src/IfaceImpl.java b/java/java-tests/testData/compileServer/incremental/generics/covariance2/src/IfaceImpl.java
similarity index 100%
rename from jps/testData/incremental/generics/covariance2/src/IfaceImpl.java
rename to java/java-tests/testData/compileServer/incremental/generics/covariance2/src/IfaceImpl.java
diff --git a/jps/testData/incremental/generics/covarianceNoChanges.log b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges.log
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges.log
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges.log
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/.name
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/Derived.java.new b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/Derived.java.new
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/Derived.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/Derived.java.new
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/src/Base.java b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Base.java
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Client.java
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/src/Derived.java b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Derived.java
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/src/Value.java b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Value.java
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/src/Value.java
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/Value.java
diff --git a/jps/testData/incremental/generics/covarianceNoChanges/src/ValueDerived.java b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/ValueDerived.java
similarity index 100%
rename from jps/testData/incremental/generics/covarianceNoChanges/src/ValueDerived.java
rename to java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/src/ValueDerived.java
diff --git a/jps/testData/incremental/generics/degenerify.log b/java/java-tests/testData/compileServer/incremental/generics/degenerify.log
similarity index 100%
rename from jps/testData/incremental/generics/degenerify.log
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify.log
diff --git a/jps/testData/incremental/generics/degenerify/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/.name
diff --git a/jps/testData/incremental/generics/degenerify/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/degenerify/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/degenerify/A.java.new b/java/java-tests/testData/compileServer/incremental/generics/degenerify/A.java.new
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/A.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/A.java.new
diff --git a/jps/testData/incremental/generics/degenerify/Degenerify.iml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/Degenerify.iml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/Degenerify.iml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/Degenerify.iml
diff --git a/jps/testData/incremental/generics/degenerify/src/A.java b/java/java-tests/testData/compileServer/incremental/generics/degenerify/src/A.java
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/src/A.java
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/src/A.java
diff --git a/jps/testData/incremental/generics/degenerify/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/degenerify/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/degenerify/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify/src/Client.java
diff --git a/jps/testData/incremental/generics/degenerify1.log b/java/java-tests/testData/compileServer/incremental/generics/degenerify1.log
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1.log
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1.log
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/.name
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/degenerify1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/degenerify1/A.java.new b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/A.java.new
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/A.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/A.java.new
diff --git a/jps/testData/incremental/generics/degenerify1/Degenerify1.iml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/Degenerify1.iml
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/Degenerify1.iml
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/Degenerify1.iml
diff --git a/jps/testData/incremental/generics/degenerify1/src/A.java b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/src/A.java
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/src/A.java
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/src/A.java
diff --git a/jps/testData/incremental/generics/degenerify1/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/degenerify1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/degenerify1/src/Client.java
diff --git a/jps/testData/incremental/generics/fieldTypeChange.log b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange.log
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange.log
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange.log
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/.name
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/FieldTypeChange.iml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/FieldTypeChange.iml
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/FieldTypeChange.iml
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/FieldTypeChange.iml
diff --git a/jps/testData/incremental/generics/fieldTypeChange/Server.java.new b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/Server.java.new
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/Server.java.new
diff --git a/jps/testData/incremental/generics/fieldTypeChange/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/src/Client.java
diff --git a/jps/testData/incremental/generics/fieldTypeChange/src/GenericType.java b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/src/GenericType.java
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/src/GenericType.java
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/src/GenericType.java
diff --git a/jps/testData/incremental/generics/fieldTypeChange/src/Server.java b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/src/Server.java
similarity index 100%
rename from jps/testData/incremental/generics/fieldTypeChange/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/src/Server.java
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous.log b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous.log
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous.log
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous.log
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/.name
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/data.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/data.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src-packageA$Base.java.new
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/src-packageA$Base.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src-packageA$Base.java.new
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Base.java b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Base.java
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Derived.java b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Derived.java
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Derived.java
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Derived.java
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile.log b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile.log
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile.log
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile.log
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/.name
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src-packageA$Base.java.new
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src-packageA$Base.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src-packageA$Base.java.new
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Base.java b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Base.java
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Derived.java b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Derived.java
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Derived.java
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Derived.java
diff --git a/jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/RunnableAdapter.java b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/RunnableAdapter.java
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/RunnableAdapter.java
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/RunnableAdapter.java
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner.log b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner.log
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner.log
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner.log
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/.name
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/data.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/data.xml
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/data.xml
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/data.xml
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src-packageA$Base.java.new
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/src-packageA$Base.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src-packageA$Base.java.new
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/src/packageA/Base.java b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src/packageA/Base.java
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/src/packageA/Base.java
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src/packageA/Base.java
diff --git a/jps/testData/incremental/generics/overrideAnnotatedInner/src/packageA/Derived.java b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src/packageA/Derived.java
similarity index 100%
rename from jps/testData/incremental/generics/overrideAnnotatedInner/src/packageA/Derived.java
rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src/packageA/Derived.java
diff --git a/jps/testData/incremental/generics/paramTypes.log b/java/java-tests/testData/compileServer/incremental/generics/paramTypes.log
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes.log
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes.log
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/.name
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/paramTypes/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/paramTypes/ParamTypes.iml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/ParamTypes.iml
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/ParamTypes.iml
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/ParamTypes.iml
diff --git a/jps/testData/incremental/generics/paramTypes/Server.java.new b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/Server.java.new
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/Server.java.new
diff --git a/jps/testData/incremental/generics/paramTypes/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/Client.java
diff --git a/jps/testData/incremental/generics/paramTypes/src/DataBase.java b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/DataBase.java
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/src/DataBase.java
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/DataBase.java
diff --git a/jps/testData/incremental/generics/paramTypes/src/DataDerived.java b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/DataDerived.java
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/src/DataDerived.java
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/DataDerived.java
diff --git a/jps/testData/incremental/generics/paramTypes/src/Server.java b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/Server.java
similarity index 100%
rename from jps/testData/incremental/generics/paramTypes/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/generics/paramTypes/src/Server.java
diff --git a/jps/testData/incremental/generics/returnType.log b/java/java-tests/testData/compileServer/incremental/generics/returnType.log
similarity index 100%
rename from jps/testData/incremental/generics/returnType.log
rename to java/java-tests/testData/compileServer/incremental/generics/returnType.log
diff --git a/jps/testData/incremental/generics/returnType/.idea/.name b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/.name
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/.name
diff --git a/jps/testData/incremental/generics/returnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/compiler.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/encodings.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/misc.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/modules.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/vcs.xml
diff --git a/jps/testData/incremental/generics/returnType/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/workspace.xml
diff --git a/jps/testData/incremental/generics/returnType/ReturnType.iml b/java/java-tests/testData/compileServer/incremental/generics/returnType/ReturnType.iml
similarity index 100%
rename from jps/testData/incremental/generics/returnType/ReturnType.iml
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/ReturnType.iml
diff --git a/jps/testData/incremental/generics/returnType/Server.java.new b/java/java-tests/testData/compileServer/incremental/generics/returnType/Server.java.new
similarity index 100%
rename from jps/testData/incremental/generics/returnType/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/Server.java.new
diff --git a/jps/testData/incremental/generics/returnType/src/Client.java b/java/java-tests/testData/compileServer/incremental/generics/returnType/src/Client.java
similarity index 100%
rename from jps/testData/incremental/generics/returnType/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/src/Client.java
diff --git a/jps/testData/incremental/generics/returnType/src/GenericType.java b/java/java-tests/testData/compileServer/incremental/generics/returnType/src/GenericType.java
similarity index 100%
rename from jps/testData/incremental/generics/returnType/src/GenericType.java
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/src/GenericType.java
diff --git a/jps/testData/incremental/generics/returnType/src/Server.java b/java/java-tests/testData/compileServer/incremental/generics/returnType/src/Server.java
similarity index 100%
rename from jps/testData/incremental/generics/returnType/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/generics/returnType/src/Server.java
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/WEB-INF/web.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/WEB-INF/web.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/WEB-INF/web.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/WEB-INF/web.xml
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/data.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/data.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/data.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/data.xml
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/exploded/WEB-INF/classes/a.class b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/WEB-INF/classes/a.class
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/exploded/WEB-INF/classes/a.class
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/WEB-INF/classes/a.class
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/exploded/WEB-INF/lib/xxx.jar b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/WEB-INF/lib/xxx.jar
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/exploded/WEB-INF/lib/xxx.jar
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/WEB-INF/lib/xxx.jar
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/exploded/WEB-INF/web.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/WEB-INF/web.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/exploded/WEB-INF/web.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/WEB-INF/web.xml
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/exploded/a.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/a.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/exploded/a.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/exploded/a.jsp
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/lib/xxx.jar b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/lib/xxx.jar
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/lib/xxx.jar
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/lib/xxx.jar
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/module.iml b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/module.iml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/module.iml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/module.iml
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/root/a.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/root/a.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/root/a.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/root/a.jsp
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/source/a.java b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/source/a.java
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/source/a.java
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/source/a.java
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/source/x/S.java b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/source/x/S.java
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/source/x/S.java
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/source/x/S.java
diff --git a/jps/testData/incremental/jasperValidation/javaDependent/source/x/S.java.new b/java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/source/x/S.java.new
similarity index 100%
rename from jps/testData/incremental/jasperValidation/javaDependent/source/x/S.java.new
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/javaDependent/source/x/S.java.new
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/WEB-INF/web.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/WEB-INF/web.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/WEB-INF/web.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/WEB-INF/web.xml
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/data.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/data.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/data.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/data.xml
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/exploded/WEB-INF/classes/a.class b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/WEB-INF/classes/a.class
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/exploded/WEB-INF/classes/a.class
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/WEB-INF/classes/a.class
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/exploded/WEB-INF/lib/xxx.jar b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/WEB-INF/lib/xxx.jar
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/exploded/WEB-INF/lib/xxx.jar
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/WEB-INF/lib/xxx.jar
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/exploded/WEB-INF/web.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/WEB-INF/web.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/exploded/WEB-INF/web.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/WEB-INF/web.xml
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/exploded/a.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/a.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/exploded/a.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/a.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/exploded/dep.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/dep.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/exploded/dep.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/dep.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/exploded/dep2.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/dep2.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/exploded/dep2.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/dep2.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/exploded/dir/xxx.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/dir/xxx.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/exploded/dir/xxx.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/exploded/dir/xxx.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/lib/xxx.jar b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/lib/xxx.jar
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/lib/xxx.jar
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/lib/xxx.jar
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/module.iml b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/module.iml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/module.iml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/module.iml
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/root/a.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/a.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/root/a.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/a.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/root/dep.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dep.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/root/dep.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dep.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/root/dep.jsp.new b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dep.jsp.new
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/root/dep.jsp.new
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dep.jsp.new
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/root/dep2.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dep2.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/root/dep2.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dep2.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/root/dir/xxx.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dir/xxx.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/root/dir/xxx.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/root/dir/xxx.jsp
diff --git a/jps/testData/incremental/jasperValidation/jspDependent/source/a.java b/java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/source/a.java
similarity index 100%
rename from jps/testData/incremental/jasperValidation/jspDependent/source/a.java
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/jspDependent/source/a.java
diff --git a/jps/testData/incremental/jasperValidation/scope/data.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/data.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/data.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/data.xml
diff --git a/jps/testData/incremental/jasperValidation/scope/exploded/WEB-INF/web.xml b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/WEB-INF/web.xml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/exploded/WEB-INF/web.xml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/WEB-INF/web.xml
diff --git a/jps/testData/incremental/jasperValidation/scope/exploded/a.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/a.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/exploded/a.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/a.jsp
diff --git a/jps/testData/incremental/jasperValidation/scope/exploded/dep.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/dep.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/exploded/dep.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/dep.jsp
diff --git a/jps/testData/incremental/jasperValidation/scope/exploded/dep2.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/dep2.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/exploded/dep2.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/dep2.jsp
diff --git a/jps/testData/incremental/jasperValidation/scope/exploded/dir/xxx.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/dir/xxx.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/exploded/dir/xxx.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/exploded/dir/xxx.jsp
diff --git a/jps/testData/incremental/jasperValidation/scope/module.iml b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/module.iml
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/module.iml
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/module.iml
diff --git a/jps/testData/incremental/jasperValidation/scope/root/a.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/a.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/root/a.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/a.jsp
diff --git a/jps/testData/incremental/jasperValidation/scope/root/b.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/b.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/root/b.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/b.jsp
diff --git a/jps/testData/incremental/jasperValidation/scope/root/dep.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/dep.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/root/dep.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/dep.jsp
diff --git a/jps/testData/incremental/jasperValidation/scope/root/dep.jsp.new b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/dep.jsp.new
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/root/dep.jsp.new
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/dep.jsp.new
diff --git a/jps/testData/incremental/jasperValidation/scope/root/dep2.jsp b/java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/dep2.jsp
similarity index 100%
rename from jps/testData/incremental/jasperValidation/scope/root/dep2.jsp
rename to java/java-tests/testData/compileServer/incremental/jasperValidation/scope/root/dep2.jsp
diff --git a/jps/testData/incremental/markDirty/recompileDependent.log b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent.log
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent.log
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent.log
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/.name b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/.name
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/.name
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/compiler.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/encodings.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/misc.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/modules.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/vcs.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/.idea/workspace.xml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/RecompileDependent.iml b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/RecompileDependent.iml
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/RecompileDependent.iml
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/RecompileDependent.iml
diff --git a/jps/testData/incremental/markDirty/recompileDependent/Server.java.new b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/Server.java.new
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/Server.java.new
diff --git a/jps/testData/incremental/markDirty/recompileDependent/src/Client.java b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/src/Client.java
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/src/Client.java
diff --git a/jps/testData/incremental/markDirty/recompileDependent/src/Server.java b/java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/src/Server.java
similarity index 100%
rename from jps/testData/incremental/markDirty/recompileDependent/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/markDirty/recompileDependent/src/Server.java
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod.log
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/data.xml
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/src-packageA$BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src-packageA$BaseServer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/src-packageA$BaseServer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src-packageA$BaseServer.java.new
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/src/packageA/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/BaseServer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/src/packageA/BaseServer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/BaseServer.java
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/Client.java
diff --git a/jps/testData/incremental/membersChange/addAbstractMethod/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addAbstractMethod/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/Server.java
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter.log b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter.log
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/Base.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/Base.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/Base.java.new
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/data.xml
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addConstructorParameter/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addConstructorParameter/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass.log b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass.log
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/BaseServer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/BaseServer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/BaseServer.java.new
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/addFieldToBaseClass.log b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/addFieldToBaseClass.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/addFieldToBaseClass.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/addFieldToBaseClass.log
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/data.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/src/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/src/BaseServer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/src/BaseServer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/src/BaseServer.java
diff --git a/jps/testData/incremental/membersChange/addFieldToBaseClass/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToBaseClass/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/src/Server.java
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived.log b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived.log
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/Derived.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/Derived.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/Derived.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/Derived.java.new
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/data.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addFieldToDerived/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToDerived/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface.log b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface.log
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/BaseInterface.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/BaseInterface.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/BaseInterface.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/BaseInterface.java.new
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/data.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/src/BaseInterface.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/BaseInterface.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/src/BaseInterface.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/BaseInterface.java
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2.log b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2.log
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/BaseInterface.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/BaseInterface.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/BaseInterface.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/BaseInterface.java.new
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/data.xml
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/src/BaseInterface.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/src/BaseInterface.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/src/BaseInterface.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/src/BaseInterface.java
diff --git a/jps/testData/incremental/membersChange/addFieldToInterface2/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFieldToInterface2/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass.log b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass.log
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/BaseServer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/BaseServer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/BaseServer.java.new
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/data.xml
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/BaseServer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/BaseServer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/BaseServer.java
diff --git a/jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/src/Server.java
diff --git a/jps/testData/incremental/membersChange/addHidingField.log b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField.log
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/AddHidingField.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/AddHidingField.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/AddHidingField.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/AddHidingField.iml
diff --git a/jps/testData/incremental/membersChange/addHidingField/BaseAction.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/BaseAction.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/BaseAction.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/BaseAction.java.new
diff --git a/jps/testData/incremental/membersChange/addHidingField/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/data.xml
diff --git a/jps/testData/incremental/membersChange/addHidingField/src/BaseAction.java b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/src/BaseAction.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/src/BaseAction.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/src/BaseAction.java
diff --git a/jps/testData/incremental/membersChange/addHidingField/src/BaseClient.java b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/src/BaseClient.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/src/BaseClient.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/src/BaseClient.java
diff --git a/jps/testData/incremental/membersChange/addHidingField/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingField/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addHidingMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod.log
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/AddHidingMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/AddHidingMethod.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/AddHidingMethod.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/AddHidingMethod.iml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/BaseAction.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/BaseAction.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/BaseAction.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/BaseAction.java.new
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/data.xml
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/src/BaseAction.java b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/src/BaseAction.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/src/BaseAction.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/src/BaseAction.java
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/src/BaseClient.java b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/src/BaseClient.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/src/BaseClient.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/src/BaseClient.java
diff --git a/jps/testData/incremental/membersChange/addHidingMethod/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addHidingMethod/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod.log
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/Service.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/Service.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/Service.java.new
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/data.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/src/Service.java b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/src/Service.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/src/Service.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/src/Service.java
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod/src/ServiceImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/src/ServiceImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod/src/ServiceImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/src/ServiceImpl.java
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2.log b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2.log
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/Service.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/Service.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/Service.java.new
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/data.xml
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/src/DerivedService.java b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/src/DerivedService.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/src/DerivedService.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/src/DerivedService.java
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/src/Service.java b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/src/Service.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/src/Service.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/src/Service.java
diff --git a/jps/testData/incremental/membersChange/addInterfaceMethod2/src/ServiceImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/src/ServiceImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addInterfaceMethod2/src/ServiceImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/src/ServiceImpl.java
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived.log b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived.log
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/Derived.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/Derived.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/Derived.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/Derived.java.new
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/data.xml
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addLessAccessibleFieldToDerived/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/addMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod.log
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addMethod/A.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/A.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/A.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/A.java.new
diff --git a/jps/testData/incremental/membersChange/addMethod/addMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/addMethod.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/addMethod.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/addMethod.iml
diff --git a/jps/testData/incremental/membersChange/addMethod/src/A.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/src/A.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/src/A.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/src/A.java
diff --git a/jps/testData/incremental/membersChange/addMethod/src/C.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/src/C.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/src/C.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/src/C.java
diff --git a/jps/testData/incremental/membersChange/addMethod/src/D.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/src/D.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethod/src/D.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethod/src/D.java
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType.log
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/BaseServer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/BaseServer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/BaseServer.java.new
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/data.xml
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/src/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/src/BaseServer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/src/BaseServer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/src/BaseServer.java
diff --git a/jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMethodWithIncompatibleReturnType/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/src/Server.java
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase.log
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/BaseServer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/BaseServer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/BaseServer.java.new
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/data.xml
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/src/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/src/BaseServer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/src/BaseServer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/src/BaseServer.java
diff --git a/jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreAccessibleMethodToBase/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/src/Server.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific.log
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/Server.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/Server.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/Server.java.new
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/data.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/src/Server.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1.log
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/Derived.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/Derived.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/Derived.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/Derived.java.new
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/data.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific1/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific1/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2.log
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/Base.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/Base.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/Base.java.new
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/data.xml
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addMoreSpecific2/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addMoreSpecific2/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass.log b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass.log
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/BaseServer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/BaseServer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/BaseServer.java.new
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/data.xml
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/BaseServer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/BaseServer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/BaseServer.java
diff --git a/jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/src/Server.java
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived.log b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived.log
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived.log
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/.name
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/Derived.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/Derived.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/Derived.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/Derived.java.new
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/data.xml
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/src/Base.java
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/src/Client.java
diff --git a/jps/testData/incremental/membersChange/addStaticFieldToDerived/src/Derived.java b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/membersChange/addStaticFieldToDerived/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/src/Derived.java
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature.log b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature.log
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature.log
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/.name
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/data.xml
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src-packageA$Server.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/src-packageA$Server.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src-packageA$Server.java.new
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src/packageA/Client.java
diff --git a/jps/testData/incremental/membersChange/changeStaticMethodSignature/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/changeStaticMethodSignature/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src/packageA/Server.java
diff --git a/jps/testData/incremental/membersChange/deleteConstructor.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor.log
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/DeleteConstructor.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/DeleteConstructor.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/DeleteConstructor.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/DeleteConstructor.iml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/Server.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/Server.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/Server.java.new
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/src/Client.java
diff --git a/jps/testData/incremental/membersChange/deleteConstructor/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteConstructor/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/src/Server.java
diff --git a/jps/testData/incremental/membersChange/deleteInner.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner.log
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/DeleteInner.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/DeleteInner.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/DeleteInner.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/DeleteInner.iml
diff --git a/jps/testData/incremental/membersChange/deleteInner/Outer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/Outer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/Outer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/Outer.java.new
diff --git a/jps/testData/incremental/membersChange/deleteInner/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteInner/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/src/Client.java
diff --git a/jps/testData/incremental/membersChange/deleteInner/src/Outer.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/src/Outer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteInner/src/Outer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/src/Outer.java
diff --git a/jps/testData/incremental/membersChange/deleteMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod.log
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/DeleteMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/DeleteMethod.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/DeleteMethod.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/DeleteMethod.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/Server.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/Server.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/Server.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethod/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethod/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/src/Server.java
diff --git a/jps/testData/incremental/membersChange/deleteMethod/src/Super.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/src/Super.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethod/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/src/Super.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation.log
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/BaseImpl.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/BaseImpl.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/BaseImpl.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/BaseImpl.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/src/Base.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/src/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/src/BaseImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/src/BaseImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/src/BaseImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation/src/ConcreteBase.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/src/ConcreteBase.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation/src/ConcreteBase.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/src/ConcreteBase.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2.log
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/BaseImpl.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/BaseImpl.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/BaseImpl.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/BaseImpl.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/src/Base.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/src/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/src/BaseImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/src/BaseImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/src/BaseImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation2/src/ConcreteBase.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/src/ConcreteBase.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation2/src/ConcreteBase.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/src/ConcreteBase.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3.log
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/Base.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/Base.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/Base.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/src/Base.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/src/BaseIface.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/src/BaseIface.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/src/BaseIface.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/src/BaseIface.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation3/src/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/src/BaseImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation3/src/BaseImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/src/BaseImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4.log
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/Base.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/Base.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/Base.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/Base.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/src/BaseIface.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/BaseIface.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/src/BaseIface.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/BaseIface.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/src/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/BaseImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/src/BaseImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/BaseImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation4/src/BaseImplImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/BaseImplImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation4/src/BaseImplImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/src/BaseImplImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5.log
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/Base.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/Base.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/Base.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/Base.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/src/BaseIface.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/BaseIface.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/src/BaseIface.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/BaseIface.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/src/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/BaseImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/src/BaseImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/BaseImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation5/src/BaseImplImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/BaseImplImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation5/src/BaseImplImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/src/BaseImplImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6.log
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/BaseImpl.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/BaseImpl.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/BaseImpl.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/BaseImpl.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/Base.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/src/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/BaseImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/src/BaseImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/BaseImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/src/BaseImplImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/BaseImplImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/src/BaseImplImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/BaseImplImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/Client.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation6/src/ConcreteBase.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/ConcreteBase.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation6/src/ConcreteBase.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/src/ConcreteBase.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7.log b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7.log
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7.log
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/.name
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/BaseImpl.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/BaseImpl.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/BaseImpl.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/BaseImpl.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/BaseImplImpl.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/BaseImplImpl.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/BaseImplImpl.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/BaseImplImpl.java.new
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/data.xml
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/src/Base.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/Base.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/Base.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/src/BaseImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/BaseImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/src/BaseImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/BaseImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/src/BaseImplImpl.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/BaseImplImpl.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/src/BaseImplImpl.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/BaseImplImpl.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/Client.java
diff --git a/jps/testData/incremental/membersChange/deleteMethodImplementation7/src/ConcreteBase.java b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/ConcreteBase.java
similarity index 100%
rename from jps/testData/incremental/membersChange/deleteMethodImplementation7/src/ConcreteBase.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/src/ConcreteBase.java
diff --git a/jps/testData/incremental/membersChange/hierarchy.log b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy.log
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy.log
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/.name
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/Hierarchy.iml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Hierarchy.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/Hierarchy.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Hierarchy.iml
diff --git a/jps/testData/incremental/membersChange/hierarchy/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Service.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/Service.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Service.java.new
diff --git a/jps/testData/incremental/membersChange/hierarchy/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/data.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy/src/Client1.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/Client1.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/src/Client1.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/Client1.java
diff --git a/jps/testData/incremental/membersChange/hierarchy/src/Client2.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/Client2.java
diff --git a/jps/testData/incremental/membersChange/hierarchy/src/Service.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/Service.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/src/Service.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/Service.java
diff --git a/jps/testData/incremental/membersChange/hierarchy/src/ServiceAdapter.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/ServiceAdapter.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy/src/ServiceAdapter.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/src/ServiceAdapter.java
diff --git a/jps/testData/incremental/membersChange/hierarchy2.log b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2.log
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2.log
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/.name
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/Hierarchy2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Hierarchy2.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/Hierarchy2.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Hierarchy2.iml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/Service.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Service.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/Service.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Service.java.new
diff --git a/jps/testData/incremental/membersChange/hierarchy2/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/data.xml
diff --git a/jps/testData/incremental/membersChange/hierarchy2/src/Client1.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/Client1.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/src/Client1.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/Client1.java
diff --git a/jps/testData/incremental/membersChange/hierarchy2/src/Client2.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/Client2.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/src/Client2.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/Client2.java
diff --git a/jps/testData/incremental/membersChange/hierarchy2/src/Service.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/Service.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/src/Service.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/Service.java
diff --git a/jps/testData/incremental/membersChange/hierarchy2/src/ServiceAdapter.java b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/ServiceAdapter.java
similarity index 100%
rename from jps/testData/incremental/membersChange/hierarchy2/src/ServiceAdapter.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/src/ServiceAdapter.java
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation.log b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation.log
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation.log
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/.name
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/A.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/A.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/A.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/A.java.new
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/data.xml
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/src/A.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/src/A.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/src/A.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/src/A.java
diff --git a/jps/testData/incremental/membersChange/removeBaseImplementation/src/B.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/src/B.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeBaseImplementation/src/B.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/src/B.java
diff --git a/jps/testData/incremental/membersChange/removeHidingField.log b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField.log
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField.log
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/.name
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/BaseAction.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/BaseAction.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/BaseAction.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/BaseAction.java.new
diff --git a/jps/testData/incremental/membersChange/removeHidingField/RemoveHidingField.iml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/RemoveHidingField.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/RemoveHidingField.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/RemoveHidingField.iml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/data.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingField/src/BaseAction.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/src/BaseAction.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/src/BaseAction.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/src/BaseAction.java
diff --git a/jps/testData/incremental/membersChange/removeHidingField/src/BaseClient.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/src/BaseClient.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/src/BaseClient.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/src/BaseClient.java
diff --git a/jps/testData/incremental/membersChange/removeHidingField/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingField/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/src/Client.java
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod.log
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod.log
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/.name
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/BaseAction.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/BaseAction.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/BaseAction.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/BaseAction.java.new
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/data.xml
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/src/BaseAction.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/src/BaseAction.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/src/BaseAction.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/src/BaseAction.java
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/src/BaseClient.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/src/BaseClient.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/src/BaseClient.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/src/BaseClient.java
diff --git a/jps/testData/incremental/membersChange/removeHidingMethod/src/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/src/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/removeHidingMethod/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/src/Client.java
diff --git a/jps/testData/incremental/membersChange/renameMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod.log
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod.log
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/.name
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/RenameMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/RenameMethod.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/RenameMethod.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/RenameMethod.iml
diff --git a/jps/testData/incremental/membersChange/renameMethod/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/data.xml
diff --git a/jps/testData/incremental/membersChange/renameMethod/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src-packageA$Server.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/src-packageA$Server.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src-packageA$Server.java.new
diff --git a/jps/testData/incremental/membersChange/renameMethod/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src/packageA/Client.java
diff --git a/jps/testData/incremental/membersChange/renameMethod/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/renameMethod/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src/packageA/Server.java
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived.log b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived.log
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived.log
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived.log
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/.name b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/.name
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/.name
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/vcs.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/workspace.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/BaseServer.java.new
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/BaseServer.java.new
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/BaseServer.java.new
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/data.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/data.xml
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/data.xml
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/data.xml
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/BaseServer.java b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/BaseServer.java
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/BaseServer.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/BaseServer.java
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception1.java b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception1.java
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception1.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception1.java
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception2.java b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception2.java
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception2.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Exception2.java
diff --git a/jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Server.java b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Server.java
similarity index 100%
rename from jps/testData/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/src/Server.java
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess.log
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/data.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/data.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/data.xml
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/src-impl$Server.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src-impl$Server.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/src-impl$Server.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src-impl$Server.java.new
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src/Client.java
diff --git a/jps/testData/incremental/methodModifiers/decConstructorAccess/src/impl/Server.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src/impl/Server.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/decConstructorAccess/src/impl/Server.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src/impl/Server.java
diff --git a/jps/testData/incremental/methodModifiers/incAccess.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess.log
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/Base.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/Base.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/Base.java.new
diff --git a/jps/testData/incremental/methodModifiers/incAccess/IncAccess.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/IncAccess.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/IncAccess.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/IncAccess.iml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/data.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/data.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/data.xml
diff --git a/jps/testData/incremental/methodModifiers/incAccess/src/Base.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/src/Base.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/src/Base.java
diff --git a/jps/testData/incremental/methodModifiers/incAccess/src/Derived.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/incAccess/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/src/Derived.java
diff --git a/jps/testData/incremental/methodModifiers/setAbstract.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract.log
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/SetAbstract.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/SetAbstract.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/SetAbstract.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/SetAbstract.iml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/Super.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/Super.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/Super.java.new
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/data.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/data.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/data.xml
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/src/AnonDerived.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/src/AnonDerived.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/src/AnonDerived.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/src/AnonDerived.java
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/src/Derived.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/src/Derived.java
diff --git a/jps/testData/incremental/methodModifiers/setAbstract/src/Super.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/src/Super.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setAbstract/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/src/Super.java
diff --git a/jps/testData/incremental/methodModifiers/setFinal.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal.log
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/SetFinal.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/SetFinal.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/SetFinal.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/SetFinal.iml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/Super.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/Super.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/Super.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/Super.java.new
diff --git a/jps/testData/incremental/methodModifiers/setFinal/data.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/data.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/data.xml
diff --git a/jps/testData/incremental/methodModifiers/setFinal/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/src/Client.java
diff --git a/jps/testData/incremental/methodModifiers/setFinal/src/Derived.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/src/Derived.java
diff --git a/jps/testData/incremental/methodModifiers/setFinal/src/Super.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/src/Super.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setFinal/src/Super.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/src/Super.java
diff --git a/jps/testData/incremental/methodModifiers/setPrivate.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate.log
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/A.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/A.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/A.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/A.java.new
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/SetPrivate.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/SetPrivate.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/SetPrivate.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/SetPrivate.iml
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/src/A.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/src/A.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/src/A.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/src/A.java
diff --git a/jps/testData/incremental/methodModifiers/setPrivate/src/B.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/src/B.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setPrivate/src/B.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/src/B.java
diff --git a/jps/testData/incremental/methodModifiers/setProtected.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected.log
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/A.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/A.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/A.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/A.java.new
diff --git a/jps/testData/incremental/methodModifiers/setProtected/SetProtected.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/SetProtected.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/SetProtected.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/SetProtected.iml
diff --git a/jps/testData/incremental/methodModifiers/setProtected/src/A.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/src/A.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/src/A.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/src/A.java
diff --git a/jps/testData/incremental/methodModifiers/setProtected/src/B.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/src/B.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/src/B.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/src/B.java
diff --git a/jps/testData/incremental/methodModifiers/setProtected/src/C.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/src/C.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setProtected/src/C.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/src/C.java
diff --git a/jps/testData/incremental/methodModifiers/setStatic.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic.log
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/A.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/A.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/A.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/A.java.new
diff --git a/jps/testData/incremental/methodModifiers/setStatic/SetStatic.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/SetStatic.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/SetStatic.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/SetStatic.iml
diff --git a/jps/testData/incremental/methodModifiers/setStatic/src/A.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/src/A.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/src/A.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/src/A.java
diff --git a/jps/testData/incremental/methodModifiers/setStatic/src/B.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/src/B.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/src/B.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/src/B.java
diff --git a/jps/testData/incremental/methodModifiers/setStatic/src/C.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/src/C.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/setStatic/src/C.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/src/C.java
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal.log
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/Server.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/Server.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/Server.java.new
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/UnsetFinal.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/UnsetFinal.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/UnsetFinal.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/UnsetFinal.iml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/data.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/data.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/data.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/src/Client.java
diff --git a/jps/testData/incremental/methodModifiers/unsetFinal/src/Server.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/src/Server.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetFinal/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/src/Server.java
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic.log b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic.log
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic.log
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic.log
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/.name
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/misc.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/modules.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/Base.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/Base.java.new
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/Base.java.new
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/UnsetStatic.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/UnsetStatic.iml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/UnsetStatic.iml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/UnsetStatic.iml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/data.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/data.xml
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/data.xml
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/src/Base.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/src/Base.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/src/Base.java
diff --git a/jps/testData/incremental/methodModifiers/unsetStatic/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodModifiers/unsetStatic/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/src/Client.java
diff --git a/jps/testData/incremental/methodProperties/addThrows.log b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows.log
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows.log
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows.log
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/.name
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/misc.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/modules.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/AddThrows.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/AddThrows.iml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/AddThrows.iml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/AddThrows.iml
diff --git a/jps/testData/incremental/methodProperties/addThrows/data.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/data.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/data.xml
diff --git a/jps/testData/incremental/methodProperties/addThrows/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src-packageA$Server.java.new
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/src-packageA$Server.java.new
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src-packageA$Server.java.new
diff --git a/jps/testData/incremental/methodProperties/addThrows/src/packageA/Client.java b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src/packageA/Client.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/src/packageA/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src/packageA/Client.java
diff --git a/jps/testData/incremental/methodProperties/addThrows/src/packageA/Server.java b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src/packageA/Server.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/addThrows/src/packageA/Server.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src/packageA/Server.java
diff --git a/jps/testData/incremental/methodProperties/changeReturnType.log b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType.log
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType.log
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType.log
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/.name
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/misc.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/modules.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/Base.java.new b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/Base.java.new
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/Base.java.new
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/ChangeReturnType.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/ChangeReturnType.iml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/ChangeReturnType.iml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/ChangeReturnType.iml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/data.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/data.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/data.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/src/Base.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/src/Base.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/src/Base.java
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/src/Client.java
diff --git a/jps/testData/incremental/methodProperties/changeReturnType/src/Derived.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/src/Derived.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType/src/Derived.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/src/Derived.java
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1.log b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1.log
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1.log
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1.log
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/.name
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/misc.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/modules.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/Base.java.new b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/Base.java.new
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/Base.java.new
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/Base.java.new
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/data.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/data.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/data.xml
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/src/Base.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/src/Base.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/src/Base.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/src/Base.java
diff --git a/jps/testData/incremental/methodProperties/changeReturnType1/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeReturnType1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/src/Client.java
diff --git a/jps/testData/incremental/methodProperties/changeSignature.log b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature.log
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature.log
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature.log
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/.name
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/misc.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/modules.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/ChangeSignature.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/ChangeSignature.iml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/ChangeSignature.iml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/ChangeSignature.iml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/Server.java.new b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/Server.java.new
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/Server.java.new
diff --git a/jps/testData/incremental/methodProperties/changeSignature/data.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/data.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/data.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/src/Client.java
diff --git a/jps/testData/incremental/methodProperties/changeSignature/src/Server.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/src/Server.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/src/Server.java
diff --git a/jps/testData/incremental/methodProperties/changeSignature1.log b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1.log
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1.log
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1.log
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/.name b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/.name
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/.name
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/compiler.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/encodings.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/misc.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/modules.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/vcs.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/workspace.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/ChangeSignature1.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/ChangeSignature1.iml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/ChangeSignature1.iml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/ChangeSignature1.iml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/Server.java.new b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/Server.java.new
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/Server.java.new
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/Server.java.new
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/data.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/data.xml
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/data.xml
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/data.xml
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/src/Client.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Client.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/src/Client.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Client.java
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/src/Iface.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Iface.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/src/Iface.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Iface.java
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/src/IfaceImpl.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/IfaceImpl.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/src/IfaceImpl.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/IfaceImpl.java
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/src/Main.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Main.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/src/Main.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Main.java
diff --git a/jps/testData/incremental/methodProperties/changeSignature1/src/Server.java b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Server.java
similarity index 100%
rename from jps/testData/incremental/methodProperties/changeSignature1/src/Server.java
rename to java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/src/Server.java
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile.log b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile.log
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile.log
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile.log
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/.name b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/.name
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/.name
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/vcs.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/workspace.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile/src/p1/package-info.java b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/src/p1/package-info.java
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile/src/p1/package-info.java
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/src/p1/package-info.java
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2.log b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2.log
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2.log
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2.log
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/.name b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/.name
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/.name
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/vcs.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/workspace.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/src/p1/annot.java b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/src/p1/annot.java
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/src/p1/annot.java
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/src/p1/annot.java
diff --git a/jps/testData/incremental/packageInfo/packageInfoNoRecompile2/src/p1/package-info.java b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/src/p1/package-info.java
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoNoRecompile2/src/p1/package-info.java
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/src/p1/package-info.java
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange.log b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange.log
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange.log
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange.log
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/.name b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/.name
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/.name
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/.name
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/copyright/profiles_settings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/copyright/profiles_settings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/copyright/profiles_settings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/scopes/scope_settings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/scopes/scope_settings.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/scopes/scope_settings.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/scopes/scope_settings.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/uiDesigner.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/uiDesigner.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/uiDesigner.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/uiDesigner.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/vcs.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/vcs.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/vcs.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/vcs.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/workspace.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/workspace.xml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/workspace.xml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/workspace.xml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src-bug$Namespace.java.new b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src-bug$Namespace.java.new
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src-bug$Namespace.java.new
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src-bug$Namespace.java.new
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Ann.java b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Ann.java
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Ann.java
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Ann.java
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Namespace.java b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Namespace.java
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Namespace.java
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Namespace.java
diff --git a/jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/package-info.java b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/package-info.java
similarity index 100%
rename from jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/package-info.java
rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/package-info.java
diff --git a/jps/jps-builders/jps-builders.iml b/jps/jps-builders/jps-builders.iml
index 1a750f0f1847..a7c2adfe8125 100644
--- a/jps/jps-builders/jps-builders.iml
+++ b/jps/jps-builders/jps-builders.iml
@@ -42,6 +42,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="testFramework" scope="TEST" />
   </component>
 </module>
 
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
index fdd01362d717..992c6883f1c7 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
@@ -15,6 +15,8 @@
  */
 package org.jetbrains.ether;
 
+import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
@@ -25,17 +27,19 @@ import org.apache.log4j.PropertyConfigurator;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.Project;
+import org.jetbrains.jps.Sdk;
 import org.jetbrains.jps.api.CanceledStatus;
 import org.jetbrains.jps.idea.IdeaProjectLoader;
-import org.jetbrains.jps.incremental.AllProjectScope;
-import org.jetbrains.jps.incremental.BuilderRegistry;
-import org.jetbrains.jps.incremental.FSState;
-import org.jetbrains.jps.incremental.IncProjectBuilder;
+import org.jetbrains.jps.incremental.*;
+import org.jetbrains.jps.incremental.java.JavaBuilder;
 import org.jetbrains.jps.incremental.storage.BuildDataManager;
 import org.jetbrains.jps.incremental.storage.ProjectTimestamps;
+import org.jetbrains.jps.server.ClasspathBootstrap;
 import org.jetbrains.jps.server.ProjectDescriptor;
 
 import java.io.*;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Properties;
 
 /**
@@ -133,7 +137,7 @@ public abstract class IncrementalTestCase extends TestCase {
   protected void setUp() throws Exception {
     super.setUp();
 
-    baseDir = "jps/testData" + File.separator + "incremental" + File.separator;
+    baseDir = PathManagerEx.getTestDataPath() + File.separator + "compileServer" + File.separator + "incremental" + File.separator;
 
     for (int i = 0; ; i++) {
       final File tmp = new File(tempDir + File.separator + "__temp__" + i);
@@ -144,12 +148,14 @@ public abstract class IncrementalTestCase extends TestCase {
     }
 
     FileUtil.copyDir(new File(getBaseDir()), new File(getWorkDir()));
+    
+    Paths.getInstance().setSystemRoot(new File(workDir));
   }
 
   @Override
   protected void tearDown() throws Exception {
     super.tearDown();
-    //delete(new File(workDir));
+    delete(new File(workDir));
   }
 
   private String getProjectName() {
@@ -267,6 +273,13 @@ public abstract class IncrementalTestCase extends TestCase {
     final String projectName = getProjectName();
     final Project project = new Project();
 
+    final Sdk jdk = project.createSdk("JavaSDK", "IDEA jdk",  System.getProperty("java.home"), null);
+    final List<String> paths = new LinkedList<String>();
+      
+    paths.add(FileUtil.toSystemIndependentName(ClasspathBootstrap.getResourcePath(Object.class).getCanonicalPath()));
+
+    jdk.setClasspath(paths);
+
     IdeaProjectLoader.loadFromPath(project, projectPath, "");
 
     final ProjectDescriptor projectDescriptor =
@@ -276,12 +289,12 @@ public abstract class IncrementalTestCase extends TestCase {
 
     builder.build(new AllProjectScope(project, true), false, true);
 
+    modify();
+
     if (SystemInfo.isUnix) {
       Thread.sleep(1000);
     }
 
-    modify();
-
     builder.build(new AllProjectScope(project, false), true, false);
 
     projectDescriptor.release();