diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 8b73583d33d..2d499134d9c 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -15,6 +15,7 @@
             <element id="module-output" name="util" />
             <element id="module-output" name="j2k" />
             <element id="module-output" name="js.translator" />
+            <element id="module-output" name="cli-common" />
           </element>
           <element id="library" level="project" name="js-libs" />
           <element id="archive" name="kotlin-js-libraries.zip">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 449020550e8..3c414759cd4 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -7,6 +7,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/build-tools/build-tools.iml" filepath="$PROJECT_DIR$/build-tools/build-tools.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" filepath="$PROJECT_DIR$/compiler/cli/cli-common/cli-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/integration-tests/compiler-integration-tests.iml" filepath="$PROJECT_DIR$/compiler/integration-tests/compiler-integration-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/compiler/tests/compiler-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" />
diff --git a/build.xml b/build.xml
index 458eb69d824..639b1ea4924 100644
--- a/build.xml
+++ b/build.xml
@@ -33,6 +33,7 @@
         <include name="compiler/frontend.java/src"/>
         <include name="compiler/backend/src"/>
         <include name="compiler/cli/src"/>
+        <include name="compiler/cli/cli-common/src"/>
         <include name="compiler/util/src"/>
         <include name="j2k/src"/>
         <include name="compiler/jet.as.java.psi/src"/>
diff --git a/compiler/cli/cli-common/cli-common.iml b/compiler/cli/cli-common/cli-common.iml
new file mode 100644
index 00000000000..623e46448b1
--- /dev/null
+++ b/compiler/cli/cli-common/cli-common.iml
@@ -0,0 +1,13 @@
+<?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="library" scope="PROVIDED" name="intellij-core" level="project" />
+  </component>
+</module>
+
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/CompilerMessageSeverity.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageSeverity.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/CompilerMessageSeverity.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageSeverity.java
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollector.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollector.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollector.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollector.java
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java
similarity index 100%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 5ba5b241055..3fc055ccfc9 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -16,6 +16,7 @@
     <orderEntry type="library" name="asm-addons" level="project" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jline" level="project" />
+    <orderEntry type="module" module-name="cli-common" exported="" />
   </component>
 </module>