diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index ad99d554cd7..efc9684f4a6 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -38,6 +38,7 @@
           <element id="module-output" name="ide-common" />
           <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
           <element id="module-output" name="idea-android" />
+          <element id="module-output" name="idea-android-output-parser" />
           <element id="module-output" name="js.serializer" />
           <element id="module-output" name="serialization" />
           <element id="module-output" name="idea-completion" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 930f3191a64..6d8f9759829 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -41,6 +41,7 @@
       <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-android/idea-android.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android.iml" group="ide" />
+      <module fileurl="file://$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" filepath="$PROJECT_DIR$/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" filepath="$PROJECT_DIR$/idea/idea-completion/idea-completion.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/idea/idea-core/idea-core.iml" filepath="$PROJECT_DIR$/idea/idea-core/idea-core.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" />
diff --git a/.idea/scopes/IDE.xml b/.idea/scopes/IDE.xml
index 9ed7edf189c..812335480e9 100644
--- a/.idea/scopes/IDE.xml
+++ b/.idea/scopes/IDE.xml
@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="IDE" pattern="file[idea]:src/*/||file[idea]:testData/*/||file[ide-common]:src/*/||file[idea-analysis]:src/*/||file[idea-android]:src/*/||file[idea-completion]:src/*/||file[idea-completion]:testData/*/||file[idea-core]:src/*/||file[idea-jps-common]:/*/||file[idea-live-templates]:/*/||file[idea-live-templates]:testData/*/||file[idea-repl]:/*/" />
+  <scope name="IDE" pattern="file[idea]:src/*/||file[idea]:testData/*/||file[ide-common]:src/*/||file[idea-analysis]:src/*/||file[idea-android]:src/*/||file[idea-completion]:src/*/||file[idea-completion]:testData/*/||file[idea-core]:src/*/||file[idea-jps-common]:/*/||file[idea-live-templates]:/*/||file[idea-live-templates]:testData/*/||file[idea-repl]:/*/||src[idea-android-output-parser]:*..*" />
 </component>
\ No newline at end of file
diff --git a/generators/generators.iml b/generators/generators.iml
index 99d62ae94da..d590b297bfd 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -37,6 +37,7 @@
     <orderEntry type="module" module-name="build-common" scope="TEST" />
     <orderEntry type="module" module-name="plugins-tests" scope="TEST" />
     <orderEntry type="module" module-name="idea-android" scope="TEST" />
+    <orderEntry type="module" module-name="idea-android-output-parser" scope="TEST" />
     <orderEntry type="module" module-name="idea-maven" scope="TEST" />
     <orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
   </component>
diff --git a/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml b/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
new file mode 100644
index 00000000000..c5537233993
--- /dev/null
+++ b/idea/idea-android/idea-android-output-parser/idea-android-output-parser.iml
@@ -0,0 +1,15 @@
+<?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="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" exported="" name="android-plugin" level="project" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="intellij-core" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/idea-android/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser b/idea/idea-android/idea-android-output-parser/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
similarity index 100%
rename from idea/idea-android/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
rename to idea/idea-android/idea-android-output-parser/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParser.java b/idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParser.java
similarity index 100%
rename from idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParser.java
rename to idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParser.java
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt b/idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
similarity index 99%
rename from idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
rename to idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
index 3423edadfe5..3fe1c58d286 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+++ b/idea/idea-android/idea-android-output-parser/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ultimate/.idea/libraries/main_project_production.xml b/ultimate/.idea/libraries/main_project_production.xml
index 5a4296b76f2..c2d200a7d20 100644
--- a/ultimate/.idea/libraries/main_project_production.xml
+++ b/ultimate/.idea/libraries/main_project_production.xml
@@ -36,6 +36,7 @@
       <root url="file://$PROJECT_DIR$/../out/production/idea" />
       <root url="file://$PROJECT_DIR$/../out/production/idea-analysis" />
       <root url="file://$PROJECT_DIR$/../out/production/idea-android" />
+      <root url="file://$PROJECT_DIR$/../out/production/idea-android-output-parser" />
       <root url="file://$PROJECT_DIR$/../out/production/idea-completion" />
       <root url="file://$PROJECT_DIR$/../out/production/idea-core" />
       <root url="file://$PROJECT_DIR$/../out/production/idea-jps-common" />
@@ -90,6 +91,7 @@
       <root url="file://$PROJECT_DIR$/../idea/ide-common/src" />
       <root url="file://$PROJECT_DIR$/../idea/idea-analysis/src" />
       <root url="file://$PROJECT_DIR$/../idea/idea-android/src" />
+      <root url="file://$PROJECT_DIR$/../idea/idea-android-output-parser/src" />
       <root url="file://$PROJECT_DIR$/../idea/idea-completion/src" />
       <root url="file://$PROJECT_DIR$/../idea/idea-core/src" />
       <root url="file://$PROJECT_DIR$/../idea/idea-jps-common/src" />