diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
index 430a63d41bc..c48f2a07a6f 100644
--- a/.idea/artifacts/KotlinJpsPlugin.xml
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -13,7 +13,7 @@
       </element>
       <element id="extracted-dir" path="$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar" path-in-jar="/" />
       <element id="module-output" name="cli-common" />
-      <element id="module-output" name="ide-compiler-runner" />
+      <element id="module-output" name="idea-jps-common" />
       <element id="module-output" name="jps-plugin" />
       <element id="module-output" name="preloader" />
       <element id="module-output" name="util" />
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index f123a82d416..db1665a520c 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -22,7 +22,7 @@
           <element id="module-output" name="j2k" />
           <element id="module-output" name="js.frontend" />
           <element id="module-output" name="cli-common" />
-          <element id="module-output" name="ide-compiler-runner" />
+          <element id="module-output" name="idea-jps-common" />
           <element id="module-output" name="preloader" />
           <element id="module-output" name="serialization" />
           <element id="module-output" name="serialization.jvm" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a4d5c8f1446..1b08050b935 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -22,9 +22,9 @@
       <module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/idea/ide-common/ide-common.iml" filepath="$PROJECT_DIR$/idea/ide-common/ide-common.iml" group="ide" />
-      <module fileurl="file://$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" filepath="$PROJECT_DIR$/ide-compiler-runner/ide-compiler-runner.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea.iml" filepath="$PROJECT_DIR$/idea/idea.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" filepath="$PROJECT_DIR$/idea/idea-analysis/idea-analysis.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" filepath="$PROJECT_DIR$/idea/idea-jps-common/idea-jps-common.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea-runner/idea-runner.iml" filepath="$PROJECT_DIR$/idea-runner/idea-runner.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" filepath="$PROJECT_DIR$/generators/injector-generator/injector-generator.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" filepath="$PROJECT_DIR$/compiler/preloader/instrumentation/instrumentation.iml" group="compiler/cli" />
diff --git a/ide-compiler-runner/ide-compiler-runner.iml b/idea/idea-jps-common/idea-jps-common.iml
similarity index 100%
rename from ide-compiler-runner/ide-compiler-runner.iml
rename to idea/idea-jps-common/idea-jps-common.iml
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java
rename to idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerSettings.kt
rename to idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/config/SettingConstants.java b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/config/SettingConstants.java
rename to idea/idea-jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java
diff --git a/idea/idea.iml b/idea/idea.iml
index 60c936000cf..36c8e53e25e 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -30,7 +30,7 @@
     <orderEntry type="library" scope="PROVIDED" name="copyright-plugin" level="project" />
     <orderEntry type="module" module-name="j2k" />
     <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="ide-compiler-runner" />
+    <orderEntry type="module" module-name="idea-jps-common" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index 0e4bcb36611..a61e33d157e 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ide-compiler-runner" />
+    <orderEntry type="module" module-name="idea-jps-common" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />