diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 0518612001c..4e01e165ebe 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -40,6 +40,7 @@
           <element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
           <element id="module-output" name="kotlin-android-plugin" />
           <element id="module-output" name="android-compiler-plugin" />
+          <element id="module-output" name="android-idea-plugin" />
         </element>
         <element id="library" level="project" name="javax.inject" />
         <element id="directory" name="jps">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0dfff9df3d4..cc9af29b280 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-compiler-plugin/android-compiler-plugin.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-idea-plugin/android-idea-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/android-jps-plugin/android-jps-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
index fad1556428b..7d94bff83c7 100644
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="IDEA" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin:$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensionsPlugin -Dkotlin.internal.mode.enabled=true" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
diff --git a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
index 295724c0d1b..280dc08405d 100644
--- a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
+++ b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application">
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=250m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin:$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensionsPlugin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
diff --git a/idea/idea.iml b/idea/idea.iml
index 6d6d7afdff2..7223af26e6a 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -46,5 +46,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="android_tests" level="project" />
     <orderEntry type="module" module-name="android-compiler-plugin" />
+    <orderEntry type="module" module-name="android-idea-plugin" />
   </component>
 </module>
diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml
index 34892ede779..4358b2f2fc2 100644
--- a/idea/src/META-INF/extensions/common.xml
+++ b/idea/src/META-INF/extensions/common.xml
@@ -8,5 +8,8 @@
                         interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression$SuppressStringProvider"/>
         <extensionPoint name="diagnosticSuppressor"
                         interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression$DiagnosticSuppressor"/>
+        <extensionPoint name="externalDeclarationsProvider"
+                        interface="org.jetbrains.jet.extensions.ExternalDeclarationsProvider"
+                        area="IDEA_PROJECT"/>
     </extensionPoints>
 </idea-plugin>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index f1d13743b1d..2063c2a6cf3 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -201,6 +201,9 @@
     <projectService serviceInterface="org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor"
                     serviceImplementation="org.jetbrains.jet.plugin.android.IDEAndroidUIXmlProcessor"/>
 
+    <projectService serviceInterface="org.jetbrains.jet.plugin.stubindex.SubpackagesIndexService"
+                    serviceImplementation="org.jetbrains.jet.plugin.stubindex.SubpackagesIndexService"/>
+
     <projectService serviceInterface="org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade"
                     serviceImplementation="org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade"/>
 
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt
index 279e8f4c00c..8766ac7032e 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiElement
 import com.intellij.openapi.project.Project
 
-abstract class AndroidResourceManager(protected val project: Project, protected val searchPath: String?) {
+public abstract class AndroidResourceManager(protected val project: Project, protected val searchPath: String?) {
     private val idDeclarationPrefix = "@+id/"
     private val idUsagePrefix = "@id/"
     public val androidNamespace: String = "android"
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
index 18ca2f0d091..aefff285e29 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
@@ -40,9 +40,9 @@ class AndroidID(val rawID: String) : AndroidResource {
     }
 }
 
-class AndroidWidget(val id: String, val className: String) : AndroidResource
+public class AndroidWidget(val id: String, val className: String) : AndroidResource
 
-class AndroidManifest(val _package: String) : AndroidResource
+public class AndroidManifest(public val _package: String) : AndroidResource
 
 fun isAndroidSyntheticFile(f: PsiFile?): Boolean {
     return f?.getUserData(org.jetbrains.jet.lang.resolve.android.AndroidConst.ANDROID_USER_PACKAGE) != null
diff --git a/plugins/android-idea-plugin/android-idea-plugin.iml b/plugins/android-idea-plugin/android-idea-plugin.iml
new file mode 100644
index 00000000000..da72a240ed3
--- /dev/null
+++ b/plugins/android-idea-plugin/android-idea-plugin.iml
@@ -0,0 +1,17 @@
+<?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="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="android-compiler-plugin" exported="" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="android" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="android_tests" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
+  </component>
+</module>
+
diff --git a/plugins/android-idea-plugin/src/META-INF/android.xml b/plugins/android-idea-plugin/src/META-INF/android.xml
new file mode 100644
index 00000000000..46321d4ff89
--- /dev/null
+++ b/plugins/android-idea-plugin/src/META-INF/android.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <gotoDeclarationHandler implementation="org.jetbrains.jet.plugin.android.AndroidGotoDeclarationHandler"/>
+    </extensions>
+</idea-plugin>
diff --git a/plugins/android-idea-plugin/src/META-INF/plugin.xml b/plugins/android-idea-plugin/src/META-INF/plugin.xml
new file mode 100644
index 00000000000..64d20a2d225
--- /dev/null
+++ b/plugins/android-idea-plugin/src/META-INF/plugin.xml
@@ -0,0 +1,18 @@
+<idea-plugin version="2" url="http://kotlin.jetbrains.org">
+  <id>org.jetbrains.kotlin.android</id>
+
+  <name>Kotlin Extensions For Android</name>
+  <description>Various extensions facilitating Android development in Kotlin</description>
+  <version>@snapshot@</version>
+  <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
+
+  <idea-version since-build="138.977" until-build="138.9999"/>
+
+  <depends optional="false">org.jetbrains.kotlin</depends>
+  <depends optional="false" config-file="android.xml">org.jetbrains.android</depends>
+
+  <extensions defaultExtensionNs="com.intellij">
+      <projectService serviceInterface="org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor"
+                      serviceImplementation="org.jetbrains.jet.plugin.android.IDEAndroidUIXmlProcessor"/>
+  </extensions>
+</idea-plugin>
diff --git a/idea/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidGotoDeclarationHandler.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidRenameProcessor.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/AndroidXmlVisitor.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidUIXmlProcessor.kt
diff --git a/idea/src/org/jetbrains/jet/plugin/android/TestConst.java b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/TestConst.java
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/android/TestConst.java
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/TestConst.java
diff --git a/idea/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java b/plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java
similarity index 100%
rename from idea/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java
rename to plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/XmlAttributeValueWrapper.java