diff --git a/.idea/modules.xml b/.idea/modules.xml
index c081eff7dd3..0abc0ef6b64 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -25,6 +25,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-runner/cli-runner.iml" group="compiler/cli" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/compiler-runner/compiler-runner.iml" filepath="$PROJECT_DIR$/compiler/compiler-runner/compiler-runner.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" filepath="$PROJECT_DIR$/compiler/tests-java8/compiler-tests-java8.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" filepath="$PROJECT_DIR$/compiler/conditional-preprocessor/conditional-preprocessor.iml" group="compiler" />
diff --git a/compiler/compiler-runner/compiler-runner.iml b/compiler/compiler-runner/compiler-runner.iml
new file mode 100644
index 00000000000..7d416137387
--- /dev/null
+++ b/compiler/compiler-runner/compiler-runner.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="build-common" />
+    <orderEntry type="module" module-name="cli-common" />
+    <orderEntry type="module" module-name="daemon-client" />
+    <orderEntry type="module" module-name="daemon-common" />
+    <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="preloader" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt b/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt
similarity index 100%
rename from jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt
rename to compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt
diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java b/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java
similarity index 100%
rename from jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java
rename to compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java
diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt
similarity index 100%
rename from jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt
rename to compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index b7f14f215a5..21a11f39ee9 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -10,6 +10,7 @@
     <orderEntry type="module" module-name="idea-jps-common" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="module" module-name="build-common" />
+    <orderEntry type="module" module-name="compiler-runner" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />