diff --git a/kotlin-power-assert/build.gradle.kts b/kotlin-power-assert-plugin/build.gradle.kts
similarity index 98%
rename from kotlin-power-assert/build.gradle.kts
rename to kotlin-power-assert-plugin/build.gradle.kts
index b859eddc782..36bc718981f 100644
--- a/kotlin-power-assert/build.gradle.kts
+++ b/kotlin-power-assert-plugin/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
 }
 
 dependencies {
-  implementation(kotlin("stdlib-jdk8"))
   compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable")
 
   kapt("com.google.auto.service:auto-service:1.0-rc6")
diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/AssertTree.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/AssertTree.kt
similarity index 100%
rename from kotlin-power-assert/src/main/kotlin/com/bnorm/power/AssertTree.kt
rename to kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/AssertTree.kt
diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/IrStackVariable.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/IrStackVariable.kt
similarity index 100%
rename from kotlin-power-assert/src/main/kotlin/com/bnorm/power/IrStackVariable.kt
rename to kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/IrStackVariable.kt
diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt
similarity index 100%
rename from kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt
rename to kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt
diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCommandLineProcessor.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCommandLineProcessor.kt
similarity index 100%
rename from kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCommandLineProcessor.kt
rename to kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCommandLineProcessor.kt
diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt
similarity index 100%
rename from kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt
rename to kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt
diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertGenerator.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertGenerator.kt
similarity index 100%
rename from kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertGenerator.kt
rename to kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertGenerator.kt
diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertIrGenerationExtension.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertIrGenerationExtension.kt
similarity index 100%
rename from kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertIrGenerationExtension.kt
rename to kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertIrGenerationExtension.kt
diff --git a/kotlin-power-assert/src/test/kotlin/com/bnorm/power/test.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/test.kt
similarity index 100%
rename from kotlin-power-assert/src/test/kotlin/com/bnorm/power/test.kt
rename to kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/test.kt
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 3f6f11980a8..8763fa65aa7 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -1,19 +1,12 @@
-buildscript {
-  dependencies {
-    classpath("gradle.plugin.com.bnorm.power:kotlin-power-assert-gradle:0.4.0")
-  }
-}
-
 plugins {
   kotlin("multiplatform") version "1.4.0"
+  id("com.bnorm.power.kotlin-power-assert") version "0.4.0"
 }
-apply(plugin = "com.bnorm.power.kotlin-power-assert")
 
 repositories {
   mavenCentral()
 }
 
-
 kotlin {
   jvm {
     compilations.all {
diff --git a/sample/settings.gradle.kts b/sample/settings.gradle.kts
index 355d216974e..1bf631e526b 100644
--- a/sample/settings.gradle.kts
+++ b/sample/settings.gradle.kts
@@ -1,9 +1,3 @@
-rootProject.name = "sample"
+rootProject.name = "kotlin-power-assert-sample"
 
-includeBuild("..") {
-  dependencySubstitution {
-    substitute(module("com.bnorm.power:kotlin-power-assert")).with(project(":kotlin-power-assert"))
-    substitute(module("com.bnorm.power:kotlin-power-assert-gradle")).with(project(":kotlin-power-assert-gradle"))
-    substitute(module("gradle.plugin.com.bnorm.power:kotlin-power-assert-gradle")).with(project(":kotlin-power-assert-gradle"))
-  }
-}
+includeBuild("..")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ecb6a630422..ec2254a6d90 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,4 @@
 rootProject.name = "kotlin-power-assert"
 
-include(":kotlin-power-assert")
 include(":kotlin-power-assert-gradle")
+include(":kotlin-power-assert-plugin")