diff --git a/libraries/tools/kotlin-gradle-android-plugin/.gitignore b/libraries/tools/kotlin-gradle-android-plugin/.gitignore
deleted file mode 100644
index b97b22398a9..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local-repo
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/base/annotations.xml
deleted file mode 100644
index 69ed1be5713..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/base/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/io/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/io/annotations.xml
deleted file mode 100644
index 64ac65dcca1..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/com/google/common/io/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='com.google.common.io.Files java.io.File createTempDir()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/annotations.xml
deleted file mode 100644
index dc5cd1bbcbe..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/annotations.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<root>
-    <item name='org.gradle.api.Plugin void apply(T)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun apply(p0 : T) : Unit&quot;"/>
-        </annotation>
-    </item>
-    <item name='org.gradle.api.Project org.gradle.api.plugins.PluginContainer getPlugins()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.gradle.api.Project org.gradle.api.plugins.Convention getConvention()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.gradle.api.Project org.gradle.api.initialization.dsl.ScriptHandler getBuildscript()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getBuildscript() : ScriptHandler&quot;"/>
-        </annotation>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml
deleted file mode 100644
index 885acfdd4ab..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='org.gradle.api.artifacts.Configuration org.gradle.api.artifacts.ResolvedConfiguration getResolvedConfiguration()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml
deleted file mode 100644
index 0402ed182e0..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/artifacts/dsl/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='org.gradle.api.Project org.gradle.api.artifacts.dsl.DependencyHandler getDependencies()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml
deleted file mode 100644
index dea5cec6774..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='org.gradle.api.file.FileCollection org.gradle.api.file.FileCollection filter(org.gradle.api.specs.Spec&lt;? super java.io.File&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml
deleted file mode 100644
index 4005fe3c2c3..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<root>
-    <item name='org.gradle.api.initialization.dsl.ScriptHandler org.gradle.api.artifacts.ConfigurationContainer getConfigurations()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getConfigurations() : ConfigurationContainer&quot;"/>
-        </annotation>
-    </item>
-    <item name='org.gradle.api.initialization.dsl.ScriptHandler org.gradle.api.artifacts.dsl.DependencyHandler getDependencies()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getDependencies() : DependencyHandler&quot;"/>
-        </annotation>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml
deleted file mode 100644
index c14ebed20ae..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root>
-    <item name='org.gradle.api.internal.HasConvention org.gradle.api.plugins.Convention getConvention()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getConvention() : Convention&quot;"/>
-        </annotation>
-    </item>
-    <item name='org.gradle.api.internal.AbstractTask org.gradle.api.logging.Logger getLogger()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.gradle.api.internal.AbstractTask org.gradle.api.Project getProject()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getProject() : Project&quot;"/>
-        </annotation>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml
deleted file mode 100644
index 6595499a4a1..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='org.gradle.api.internal.project.ProjectInternal org.gradle.api.internal.tasks.TaskContainerInternal getTasks()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml
deleted file mode 100644
index 87c8bc5da18..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='org.gradle.api.logging.Logging org.gradle.api.logging.Logger getLogger(java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml
deleted file mode 100644
index 5859b33807e..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<root>
-    <item name='org.gradle.api.plugins.Convention java.util.Map&lt;java.lang.String,java.lang.Object&gt; getPlugins()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getPlugins() : MutableMap&lt;String, Any&gt;&quot;"/>
-        </annotation>
-    </item>
-    <item name='org.gradle.api.plugins.Convention org.gradle.api.internal.DynamicObject getExtensionsAsDynamicObject()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getExtensionsAsDynamicObject() : DynamicObject&quot;"/>
-        </annotation>
-    </item>
-    <item name='org.gradle.api.plugins.PluginContainer org.gradle.api.Plugin apply(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.gradle.api.plugins.PluginContainer T apply(java.lang.Class&lt;T&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-    <item name='org.gradle.api.plugins.Convention T getPlugin(java.lang.Class&lt;T&gt;)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml
deleted file mode 100644
index 67bc433ea20..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<root>
-    <item name='org.gradle.api.tasks.SourceTask org.gradle.api.file.FileTree getSource()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun getSource() : FileTree&quot;"/>
-        </annotation>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml b/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml
deleted file mode 100644
index 812dfa500fa..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='org.gradle.api.tasks.compile.AbstractCompile org.gradle.api.file.FileCollection getClasspath()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/pom.xml b/libraries/tools/kotlin-gradle-android-plugin/pom.xml
deleted file mode 100644
index cf49bc1a651..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <maven.version>3.0.4</maven.version>
-    </properties>
-
-    <parent>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-project</artifactId>
-        <version>0.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>kotlin-gradle-android-plugin</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.android.tools.build</groupId>
-            <artifactId>gradle</artifactId>
-            <version>0.4.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-stdlib</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-gradle-plugin-core</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>kotlin-jdk-annotations</artifactId>
-          <version>${project.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.jetbrains.kotlin</groupId>
-          <artifactId>gradle-api</artifactId>
-          <version>1.4</version>
-          <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
-
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-              <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <version>${project.version}</version>
-                <configuration>
-                    <annotationPaths>
-                        <annotationPath>${basedir}/kotlinAnnotation</annotationPath>
-                    </annotationPaths>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals> <goal>compile</goal> </goals>
-                    </execution>
-
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals> <goal>test-compile</goal> </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <!-- Invoker plugin maintains local maven repository in local-repo for gradle integration tests -->
-                <artifactId>maven-invoker-plugin</artifactId>
-                <version>1.8</version>
-                <configuration>
-                    <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-                    <localRepositoryPath>local-repo</localRepositoryPath>
-                    <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>create_local</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>install</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>jetbrains-utils</id>
-            <url>http://repository.jetbrains.com/utils</url>
-        </repository>
-    </repositories>
-</project>
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt b/libraries/tools/kotlin-gradle-android-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt
deleted file mode 100644
index bbc7b1b3901..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.jetbrains.kotlin.gradle.plugin
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.gradle.api.artifacts.ConfigurationContainer
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.specs.Spec
-import java.io.File
-import java.net.URL
-import org.gradle.api.logging.Logging
-import java.util.Properties
-import java.io.FileNotFoundException
-
-open class KotlinAndroidPlugin: Plugin<Project> {
-
-    val log = Logging.getLogger(getClass())!!
-
-    public override fun apply(project: Project) {
-
-    }
-}
-
-open class KSpec<T: Any?>(val predicate: (T) -> Boolean): Spec<T> {
-    public override fun isSatisfiedBy(p0: T?): Boolean {
-        return p0 != null && predicate(p0)
-    }
-}
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/project.properties b/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/project.properties
deleted file mode 100644
index e362614406a..00000000000
--- a/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/project.properties
+++ /dev/null
@@ -1 +0,0 @@
-project.version=${project.version}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml
index 717f6ce83d6..f3474e9b223 100644
--- a/libraries/tools/kotlin-gradle-plugin/pom.xml
+++ b/libraries/tools/kotlin-gradle-plugin/pom.xml
@@ -89,6 +89,9 @@
                     <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                     <localRepositoryPath>local-repo</localRepositoryPath>
                     <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
+                    <extraArtifacts>
+                        <extraArtifact>org.jetbrains.kotlin:kotlin-gradle-plugin-core:${project.version}</extraArtifact>
+                    </extraArtifacts>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
index f2891244fc9..96c7f408828 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
@@ -12,7 +12,7 @@ import org.gradle.api.logging.Logging
 import java.util.Properties
 import java.io.FileNotFoundException
 
-open class KotlinPluginWrapper: Plugin<Project> {
+open abstract class KotlinBasePluginWrapper: Plugin<Project> {
 
     val log = Logging.getLogger(getClass())!!
 
@@ -45,7 +45,7 @@ open class KotlinPluginWrapper: Plugin<Project> {
         log.debug("Load plugin in parent-last URL classloader")
         val kotlinPluginClassloader = ParentLastURLClassLoader(kotlinPluginDependencies, getClass().getClassLoader())
         log.debug("Class loader created")
-        val cls = Class.forName("org.jetbrains.kotlin.gradle.plugin.KotlinPlugin", true, kotlinPluginClassloader)
+        val cls = Class.forName(getPluginClassName(), true, kotlinPluginClassloader)
         log.debug("Plugin class loaded")
         val pluginInstance = cls.newInstance()
         log.debug("Plugin class instantiated")
@@ -55,6 +55,20 @@ open class KotlinPluginWrapper: Plugin<Project> {
         applyMethod.invoke(pluginInstance, project);
         log.debug("'apply' method invoked successfully")
     }
+
+    public abstract fun getPluginClassName():String
+}
+
+open class KotlinPluginWrapper: KotlinBasePluginWrapper() {
+    public override fun getPluginClassName():String {
+        return "org.jetbrains.kotlin.gradle.plugin.KotlinPlugin"
+    }
+}
+
+open class KotlinAndriodPluginWrapper: KotlinBasePluginWrapper() {
+    public override fun getPluginClassName():String {
+        return "org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPlugin"
+    }
 }
 
 open class KSpec<T: Any?>(val predicate: (T) -> Boolean): Spec<T> {
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties b/libraries/tools/kotlin-gradle-plugin/src/main/resources/META-INF/gradle-plugins/kotlin-android.properties
similarity index 78%
rename from libraries/tools/kotlin-gradle-android-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties
rename to libraries/tools/kotlin-gradle-plugin/src/main/resources/META-INF/gradle-plugins/kotlin-android.properties
index 18561a8288f..6b70497392a 100644
--- a/libraries/tools/kotlin-gradle-android-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/resources/META-INF/gradle-plugins/kotlin-android.properties
@@ -1 +1 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPlugin
\ No newline at end of file
+implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinAndriodPluginWrapper
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidGradleIT.kt
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
similarity index 81%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
index ec9bcd7e87e..8680fffc926 100644
--- a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
@@ -6,12 +6,12 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-android-plugin:0.1-SNAPSHOT'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
         classpath 'com.android.tools.build:gradle:0.4'
     }
 }
 apply plugin: 'android'
-apply plugin: 'kotlin'
+apply plugin: 'kotlin-android'
 
 dependencies {
     compile files('libs/android-support-v4.jar')
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/libs/android-support-v4.jar
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/AndroidManifest.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java
similarity index 90%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java
index df46cf92ddf..c377fd177c2 100644
--- a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/java/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity.java
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.gradle.test.androidalfa;
+package AndroidAlfaProject.AndroidAlfa.src.main.java.org.jetbrains.kotlin.gradle.test.androidalfa;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/layout/activity_main2.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/menu/main_activity2.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw600dp/dimens.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-sw720dp-land/dimens.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v11/styles.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values-v14/styles.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/dimens.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/strings.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/res/values/styles.xml
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/build.gradle
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.jar
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.jar
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.properties
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradle/wrapper/gradle-wrapper.properties
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew.bat b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew.bat
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew.bat
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/gradlew.bat
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/local.properties
diff --git a/libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-android-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/settings.gradle