diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerConstants.java b/ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java
similarity index 94%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerConstants.java
rename to ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java
index 9d4bea67eb7..70c584e3f28 100644
--- a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerConstants.java
+++ b/ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.compilerRunner;
+package org.jetbrains.kotlin.config;
 
 public class CompilerRunnerConstants {
     public static final String KOTLIN_COMPILER_NAME = "Kotlin";
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java
index 8ff1a4239b2..24fd2b6fad5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java
@@ -38,8 +38,8 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.util.Set;
 
-import static org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
-import static org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
+import static org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
+import static org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
 
 public class JetCompilerManager implements ProjectComponent {
     private static final Logger LOG = Logger.getInstance(JetCompilerManager.class);
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index 6878e4f6683..23016075fe8 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -12,7 +12,7 @@
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
+    <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="backend" scope="TEST" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java
rename to jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 1989aa73f36..ac2a1951f6a 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment
-import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants
+import org.jetbrains.kotlin.config.CompilerRunnerConstants
 import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.config.IncrementalCompilation
@@ -43,7 +43,7 @@ import java.io.File
 import java.util.*
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
-import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
+import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
 import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler
 import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler
 import org.jetbrains.kotlin.utils.keysToMap
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java b/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java
rename to jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java b/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java
rename to jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java b/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java
rename to jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java
diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java b/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java
similarity index 100%
rename from ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java
rename to jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java
diff --git a/idea/tests/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
similarity index 99%
rename from idea/tests/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
rename to jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
index e00892481a4..7652295c2f9 100644
--- a/idea/tests/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
@@ -54,4 +54,4 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() {
 
         MockLibraryUtil.compileKotlinModule(xml.getAbsolutePath())
     }
-}
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
similarity index 100%
rename from idea/tests/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
rename to jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java