diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 3c7abdf1279..00000000000
Binary files a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index a91fd600121..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sun May 04 12:35:04 MSK 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew
deleted file mode 100644
index 91a7e269e19..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew.bat b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew.bat
deleted file mode 100644
index 8a0b282aa68..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt
similarity index 67%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt
index 022983e9fb6..42d92fd10c5 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt
@@ -5,19 +5,18 @@ import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
 import org.gradle.api.logging.LogLevel
 import org.junit.Ignore
 
-Ignore("temp")
-class BasicKotlinGradleIT : BaseGradleIT() {
+class SimpleKotlinGradleIT : BaseGradleIT() {
 
     Test fun testSimpleCompile() {
         val project = Project("simpleProject", "1.12")
 
-        project.build("compileDeployKotlin", "build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        project.build("compileDeployKotlin", "build") {
             assertSuccessful()
             assertReportExists("build/reports/tests/classes/demo.TestSource.html")
             assertContains(":compileKotlin", ":compileTestKotlin", ":compileDeployKotlin")
         }
 
-        project.build("compileDeployKotlin", "build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        project.build("compileDeployKotlin", "build") {
             assertSuccessful()
             assertContains(":compileKotlin UP-TO-DATE", ":compileTestKotlin UP-TO-DATE", ":compileDeployKotlin UP-TO-DATE", ":compileJava UP-TO-DATE")
         }
@@ -26,13 +25,13 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     Test fun testSuppressWarningsAndVersionInVerboseMode() {
         val project = Project("suppressWarningsAndVersion", "1.6")
 
-        project.build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        project.build("build") {
             assertSuccessful()
             assertContains(":compileKotlin", "i: Kotlin Compiler version", "v: Using Kotlin home directory")
             assertNotContains("w:")
         }
 
-        project.build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        project.build("build") {
             assertSuccessful()
             assertContains(":compileKotlin UP-TO-DATE")
             assertNotContains("w:")
@@ -42,13 +41,13 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     Test fun testSuppressWarningsAndVersionInNonVerboseMode() {
         val project = Project("suppressWarningsAndVersion", "1.6", minLogLevel = LogLevel.INFO)
 
-        project.build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        project.build("build") {
             assertSuccessful()
             assertContains(":compileKotlin", "i: Kotlin Compiler version")
             assertNotContains("w:", "v:")
         }
 
-        project.build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        project.build("build") {
             assertSuccessful()
             assertContains(":compileKotlin UP-TO-DATE")
             assertNotContains("w:", "v:")
@@ -56,19 +55,19 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     }
 
     Test fun testKotlinCustomDirectory() {
-        Project("customSrcDir", "1.6").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("customSrcDir", "1.6").build("build") {
             assertSuccessful()
         }
     }
 
     Test fun testAdvancedOptions() {
-        Project("advancedOptions", "1.6").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("advancedOptions", "1.6").build("build") {
             assertSuccessful()
         }
     }
 
     Test fun testSimpleKDoc() {
-        Project("kdocProject", "1.6").build("kdoc", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("kdocProject", "1.6").build("kdoc") {
             assertSuccessful()
             assertReportExists("build/docs/kdoc/demo/MyClass.html")
             assertContains(":kdoc", "Generating kdoc to")
@@ -76,7 +75,7 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     }
 
     Test fun testKotlinExtraJavaSrc() {
-        Project("additionalJavaSrc", "1.6").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("additionalJavaSrc", "1.6").build("build") {
             assertSuccessful()
         }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
index 67763b295e1..81f1b177501 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
@@ -3,7 +3,7 @@ package org.jetbrains.kotlin.gradle
 import org.junit.Test
 import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
 
-class BasicKotlinGradleIT: BaseGradleIT() {
+class KotlinGradleIT: BaseGradleIT() {
 
     Test fun testCrossCompile() {
         val project = Project("kotlinJavaProject", "1.6")
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.jar
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.jar
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.properties
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.properties
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew b/libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradlew
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradlew
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew.bat b/libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradlew.bat
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew.bat
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/GradleWrapper-1.12/gradlew.bat
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle
similarity index 82%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle
index 6cabbaf0bac..a32097d610e 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/build.gradle
@@ -6,13 +6,13 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin-core:0.1-SNAPSHOT'
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
   }
 }
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
 
-apply plugin: KotlinPlugin
+
+apply plugin: "kotlin"
 apply plugin: 'java'
 
 repositories {
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated/demo/Greeter.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/generated/demo/Greeter.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/generated/demo/Greeter.java
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/generated/demo/Greeter.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java/demo/HelloWorld.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/src/main/java/demo/HelloWorld.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/java/demo/HelloWorld.java
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/src/main/java/demo/HelloWorld.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/src/main/kotlin/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/additionalJavaSrc/src/main/kotlin/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/additionalJavaSrc/src/main/kotlin/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/advancedOptions/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/advancedOptions/build.gradle
similarity index 82%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/advancedOptions/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/advancedOptions/build.gradle
index 9c360515144..5bb8ffa4d1d 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/advancedOptions/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/advancedOptions/build.gradle
@@ -6,13 +6,13 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin-core:0.1-SNAPSHOT'
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
   }
 }
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
 
-apply plugin: KotlinPlugin
+
+apply plugin: "kotlin"
 
 sourceSets {
   main {
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/advancedOptions/src/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/advancedOptions/src/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/advancedOptions/src/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/advancedOptions/src/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle
similarity index 79%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle
index ce6ff524326..f05529e9226 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/build.gradle
@@ -6,13 +6,13 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin-core:0.1-SNAPSHOT'
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
   }
 }
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
 
-apply plugin: KotlinPlugin
+
+apply plugin: "kotlin"
 
 sourceSets {
   main {
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/src/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/src/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/customSrcDir/src/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/customSrcDir/src/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/build.gradle
similarity index 76%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/build.gradle
index 2a7ce36d671..bdd41073498 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/build.gradle
@@ -6,13 +6,13 @@ buildscript {
     }
   }
   dependencies {
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin-core:0.1-SNAPSHOT'
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
   }
 }
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
 
-apply plugin: KotlinPlugin
+
+apply plugin: "kotlin"
 
 repositories {
   maven {
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/src/main/kotlin/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/kdocProject/src/main/kotlin/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/kdocProject/src/main/kotlin/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle
similarity index 70%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle
index ed580063ded..80edfd6f8e5 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/build.gradle
@@ -1,5 +1,4 @@
 buildscript {
-  ext.kotlin_version = "0.1-SNAPSHOT"
   repositories {
     mavenCentral()
     maven {
@@ -7,13 +6,13 @@ buildscript {
     }
   }
   dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin-core:$kotlin_version"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT"
   }
 }
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
 
-apply plugin: KotlinPlugin
+
+apply plugin: "kotlin"
 apply plugin: 'java'
 
 sourceSets {
@@ -31,7 +30,7 @@ dependencies {
     compile 'com.google.guava:guava:12.0'
     deployCompile 'com.google.guava:guava:12.0'
     testCompile  'org.testng:testng:6.8'
-    testRuntime  "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testRuntime  "org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT"
 }
 
 test {
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/externalAnnotations/com/google/common/base/annotations.xml
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/deploy/kotlin/kotlinSrc.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/deploy/kotlin/kotlinSrc.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/deploy/kotlin/kotlinSrc.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/deploy/kotlin/kotlinSrc.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/Greeter.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/main/java/demo/Greeter.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/Greeter.java
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/main/java/demo/Greeter.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/HelloWorld.java b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/main/java/demo/HelloWorld.java
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/java/demo/HelloWorld.java
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/main/java/demo/HelloWorld.java
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/main/kotlin/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/main/kotlin/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/main/kotlin/helloWorld.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/test/kotlin/tests.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/test/kotlin/tests.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/simpleProject/src/test/kotlin/tests.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/simpleProject/src/test/kotlin/tests.kt
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/suppressWarningsAndVersion/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/build.gradle
similarity index 75%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/suppressWarningsAndVersion/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/build.gradle
index f0c428b4e6e..0ee51d6e081 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/suppressWarningsAndVersion/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/build.gradle
@@ -6,13 +6,13 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin-core:0.1-SNAPSHOT'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
     }
 }
 
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
 
-apply plugin: KotlinPlugin
+
+apply plugin: "kotlin"
 
 sourceSets {
     main {
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt