diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 54e34abf8f6..3fff4c34bf4 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -37,7 +37,7 @@
           <element id="module-output" name="idea-analysis" />
           <element id="module-output" name="ide-common" />
           <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
-          <element id="module-output" name="kotlin-android-plugin" />
+          <element id="module-output" name="idea-android" />
           <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 adc4628e103..9f96266b67f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -37,6 +37,7 @@
       <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$/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-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" />
@@ -56,7 +57,6 @@
       <module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" group="compiler/js" />
       <module fileurl="file://$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" filepath="$PROJECT_DIR$/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml" group="ide/jps" />
-      <module fileurl="file://$PROJECT_DIR$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" filepath="$PROJECT_DIR$/idea/kotlin-android-plugin/kotlin-android-plugin.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/light-classes/light-classes.iml" filepath="$PROJECT_DIR$/compiler/light-classes/light-classes.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" filepath="$PROJECT_DIR$/compiler/plugin-api/plugin-api.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
diff --git a/generators/generators.iml b/generators/generators.iml
index b38116acf8e..dbf6e676ca9 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -33,6 +33,6 @@
     <orderEntry type="module" module-name="container" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="build-common" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin-android-plugin" scope="TEST" />
+    <orderEntry type="module" module-name="idea-android" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 5d9e936a50c..4e950891dcc 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -974,7 +974,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("idea/kotlin-android-plugin/tests", "idea/testData") {
+    testGroup("idea/idea-android/tests", "idea/testData") {
         testClass<AbstractConfigureProjectTest>() {
             model("configuration/android-gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestAndroidGradle")
         }
diff --git a/idea/kotlin-android-plugin/kotlin-android-plugin.iml b/idea/idea-android/idea-android.iml
similarity index 100%
rename from idea/kotlin-android-plugin/kotlin-android-plugin.iml
rename to idea/idea-android/idea-android.iml
diff --git a/idea/kotlin-android-plugin/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser b/idea/idea-android/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
similarity index 100%
rename from idea/kotlin-android-plugin/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
rename to idea/idea-android/src/META-INF/services/com.android.ide.common.blame.parser.PatternAwareOutputParser
diff --git a/idea/kotlin-android-plugin/src/inspectionDescriptions/IllegalIdentifier.html b/idea/idea-android/src/inspectionDescriptions/IllegalIdentifier.html
similarity index 100%
rename from idea/kotlin-android-plugin/src/inspectionDescriptions/IllegalIdentifier.html
rename to idea/idea-android/src/inspectionDescriptions/IllegalIdentifier.html
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.java b/idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParser.java
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParser.java
rename to idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParser.java
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/KotlinNewActivityNotification.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/actions/KotlinNewActivityNotification.kt
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/KotlinNewActivityNotification.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/actions/KotlinNewActivityNotification.kt
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/actions/NewKotlinActivityAction.kt
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/androidUtil.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/androidUtil.kt
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/androidUtil.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/androidUtil.kt
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java
rename to idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidGradleModuleConfigurator.java
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/facet/KotlinAndroidStartupManager.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/facet/KotlinAndroidStartupManager.kt
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/facet/KotlinAndroidStartupManager.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/facet/KotlinAndroidStartupManager.kt
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/KotlinAndroidGotoDeclarationHandler.java b/idea/idea-android/src/org/jetbrains/kotlin/android/navigation/KotlinAndroidGotoDeclarationHandler.java
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/KotlinAndroidGotoDeclarationHandler.java
rename to idea/idea-android/src/org/jetbrains/kotlin/android/navigation/KotlinAndroidGotoDeclarationHandler.java
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
similarity index 100%
rename from idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
rename to idea/idea-android/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
diff --git a/idea/kotlin-android-plugin/tests/org/jetbrains/kotlin/android/configure/AbstractConfigureProjectTest.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/configure/AbstractConfigureProjectTest.java
similarity index 100%
rename from idea/kotlin-android-plugin/tests/org/jetbrains/kotlin/android/configure/AbstractConfigureProjectTest.java
rename to idea/idea-android/tests/org/jetbrains/kotlin/android/configure/AbstractConfigureProjectTest.java
diff --git a/idea/kotlin-android-plugin/tests/org/jetbrains/kotlin/android/configure/ConfigureProjectTestGenerated.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/configure/ConfigureProjectTestGenerated.java
similarity index 100%
rename from idea/kotlin-android-plugin/tests/org/jetbrains/kotlin/android/configure/ConfigureProjectTestGenerated.java
rename to idea/idea-android/tests/org/jetbrains/kotlin/android/configure/ConfigureProjectTestGenerated.java
diff --git a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
index fe59d4b795f..e7981c7de8b 100644
--- a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
+++ b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
@@ -9,7 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="android-extensions-compiler" exported="" />
-    <orderEntry type="module" module-name="kotlin-android-plugin" />
+    <orderEntry type="module" module-name="idea-android" />
     <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea" scope="PROVIDED" />
     <orderEntry type="module" module-name="idea-core" scope="PROVIDED" />