diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index d2d050547b6..0518612001c 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -38,8 +38,8 @@
           <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="frontend.android" />
           <element id="module-output" name="kotlin-android-plugin" />
+          <element id="module-output" name="android-compiler-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 8352a20654e..0e4be34ac14 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -18,7 +18,6 @@
       <module fileurl="file://$PROJECT_DIR$/core/descriptors/descriptors.iml" filepath="$PROJECT_DIR$/core/descriptors/descriptors.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/eval4j/eval4j.iml" filepath="$PROJECT_DIR$/eval4j/eval4j.iml" group="ide" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/compiler/frontend/frontend.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/frontend.android/frontend.android.iml" filepath="$PROJECT_DIR$/compiler/frontend.android/frontend.android.iml" group="compiler" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/generators/generators.iml" filepath="$PROJECT_DIR$/generators/generators.iml" group="infrastructure" />
       <module fileurl="file://$PROJECT_DIR$/grammar/grammar.iml" filepath="$PROJECT_DIR$/grammar/grammar.iml" group="compiler" />
@@ -52,4 +51,4 @@
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
     </modules>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index 37d5b825d8e..99dd590be05 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -15,5 +15,6 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="backend-common" exported="" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="android-compiler-plugin" />
   </component>
 </module>
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 4eda81783e8..b2429816d0e 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -19,6 +19,6 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend.android" />
+    <orderEntry type="module" module-name="android-compiler-plugin" />
   </component>
 </module>
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
index 4cc0eaa8b4b..e253bea2077 100644
--- a/compiler/frontend.java/frontend.java.iml
+++ b/compiler/frontend.java/frontend.java.iml
@@ -14,6 +14,6 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend.android" />
+    <orderEntry type="module" module-name="android-compiler-plugin" />
   </component>
 </module>
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 500933988df..4b530cba261 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -22,5 +22,6 @@
     <orderEntry type="module" module-name="preloader" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="frontend.android" scope="TEST" />
+    <orderEntry type="module" module-name="android-compiler-plugin" />
   </component>
 </module>
diff --git a/generators/generators.iml b/generators/generators.iml
index 1dc96699ec1..93e0b47a496 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -24,5 +24,6 @@
     <orderEntry type="module" module-name="js.dart-ast" scope="TEST" />
     <orderEntry type="module" module-name="js.frontend" scope="TEST" />
     <orderEntry type="module" module-name="util" scope="TEST" />
+    <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
index 750a0614971..6d6d7afdff2 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -38,12 +38,13 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="eval4j" />
-    <orderEntry type="module" module-name="frontend.android" />
     <orderEntry type="library" name="android" level="project" />
     <orderEntry type="module" module-name="idea-analysis" exported="" />
     <orderEntry type="module" module-name="kotlin-android-plugin" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" name="android_tests" level="project" />
+    <orderEntry type="module" module-name="android-compiler-plugin" />
   </component>
 </module>
diff --git a/plugins/android-compiler-plugin/android-compiler-plugin.iml b/plugins/android-compiler-plugin/android-compiler-plugin.iml
new file mode 100644
index 00000000000..f8a2921965a
--- /dev/null
+++ b/plugins/android-compiler-plugin/android-compiler-plugin.iml
@@ -0,0 +1,16 @@
+<?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="module" module-name="plugin-api" exported="" />
+    <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="cli" />
+  </component>
+</module>
+
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.java b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.java
similarity index 100%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.java
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidConst.java
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt
similarity index 100%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManager.kt
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt
similarity index 100%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt
similarity index 98%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt
index 3a6dcdcbef0..6d55bff5edd 100644
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUIXmlProcessor.kt
@@ -50,7 +50,7 @@ import org.jetbrains.jet.lang.resolve.android.AndroidConst.*
 
 public abstract class AndroidUIXmlProcessor(protected val project: Project) {
 
-    class NoAndroidManifestFound : Exception("No android manifest file found in project root")
+    public class NoAndroidManifestFound : Exception("No android manifest file found in project root")
 
     private enum class CacheAction { HIT; MISS }
 
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
similarity index 95%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
index 42a21264a3b..18ca2f0d091 100644
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidUtil.kt
@@ -45,7 +45,7 @@ class AndroidWidget(val id: String, val className: String) : AndroidResource
 class AndroidManifest(val _package: String) : AndroidResource
 
 fun isAndroidSyntheticFile(f: PsiFile?): Boolean {
-    return f?.getUserData(AndroidConst.ANDROID_USER_PACKAGE) != null
+    return f?.getUserData(org.jetbrains.jet.lang.resolve.android.AndroidConst.ANDROID_USER_PACKAGE) != null
 }
 
 public fun isAndroidSyntheticElement(element: PsiElement?): Boolean {
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt
similarity index 100%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidXmlHandler.kt
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt
similarity index 81%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt
index 9f6fed802e0..961d1a5ec0f 100644
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidResourceManager.kt
@@ -21,11 +21,10 @@ import java.io.File
 import java.io.FileInputStream
 import org.xml.sax.helpers.DefaultHandler
 import org.xml.sax.Attributes
-import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor.NoAndroidManifestFound
 import javax.xml.parsers.SAXParser
 import javax.xml.parsers.SAXParserFactory
 
-public class CliAndroidResourceManager(project: Project, searchPath: String?, private val manifestPath: String?) : AndroidResourceManagerBase(project, searchPath) {
+public class CliAndroidResourceManager(project: Project, searchPath: String?, private val manifestPath: String?) : org.jetbrains.jet.lang.resolve.android.AndroidResourceManagerBase(project, searchPath) {
 
     val saxParser: SAXParser = initSAX()
 
@@ -34,7 +33,7 @@ public class CliAndroidResourceManager(project: Project, searchPath: String?, pr
         saxFactory?.setNamespaceAware(true)
         return saxFactory!!.newSAXParser()
     }
-    override fun readManifest(): AndroidManifest {
+    override fun readManifest(): org.jetbrains.jet.lang.resolve.android.AndroidManifest {
         try {
             val manifestXml = File(manifestPath!!)
             var _package: String = ""
@@ -49,10 +48,10 @@ public class CliAndroidResourceManager(project: Project, searchPath: String?, pr
             catch (e: Exception) {
                 throw e
             }
-            return AndroidManifest(_package)
+            return org.jetbrains.jet.lang.resolve.android.AndroidManifest(_package)
         }
         catch (e: Exception) {
-            throw NoAndroidManifestFound()
+            throw org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor.NoAndroidManifestFound()
         }
     }
 }
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt
similarity index 72%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt
index 2901256b0ab..11d334cbe80 100644
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/CliAndroidUIXmlProcessor.kt
@@ -20,16 +20,16 @@ import java.util.ArrayList
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 
-class CliAndroidUIXmlProcessor(project: Project, override val searchPath: String?, val manifestPath: String?) : AndroidUIXmlProcessor(project) {
+public class CliAndroidUIXmlProcessor(project: Project, override val searchPath: String?, val manifestPath: String?) : org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor(project) {
 
     override var androidAppPackage: String = ""
         get() = resourceManager.readManifest()._package
 
-    override val resourceManager = CliAndroidResourceManager(project, searchPath, manifestPath)
+    override val resourceManager = org.jetbrains.jet.lang.resolve.android.CliAndroidResourceManager(project, searchPath, manifestPath)
 
     override fun parseSingleFileImpl(file: PsiFile): String {
         val ids: MutableCollection<AndroidWidget> = ArrayList()
-        val handler = AndroidXmlHandler(resourceManager, { id, wClass -> ids.add(AndroidWidget(id, wClass)) })
+        val handler = org.jetbrains.jet.lang.resolve.android.AndroidXmlHandler(resourceManager, { id, wClass -> ids.add(AndroidWidget(id, wClass)) })
         try {
             resourceManager.saxParser.parse(file.getVirtualFile()?.getInputStream()!!, handler)
             return produceKotlinProperties(KotlinStringWriter(), ids).toString()
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/Context.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/Context.kt
similarity index 100%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/Context.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/Context.kt
diff --git a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt
similarity index 97%
rename from compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt
rename to plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt
index 1e46e8d247a..6cdd1ed291f 100644
--- a/compiler/frontend.android/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/KotlinWriter.kt
@@ -22,7 +22,7 @@ trait KotlinWriter {
 
 class KotlinStringWriter : KotlinWriter {
 
-    private val ctx = Context()
+    private val ctx = org.jetbrains.jet.lang.resolve.android.Context()
     private val imports = ctx.fork()
     private val body = ctx.fork()