diff --git a/annotation/build.gradle b/kotlin-builder-annotation/build.gradle
similarity index 83%
rename from annotation/build.gradle
rename to kotlin-builder-annotation/build.gradle
index bf9a9b3..35bd040 100644
--- a/annotation/build.gradle
+++ b/kotlin-builder-annotation/build.gradle
@@ -18,10 +18,6 @@ dependencies {
 publishing {
     publications {
         maven(MavenPublication) {
-            groupId = group
-            artifactId = 'kotlin-builder-annotation'
-            version = version
-
             from components.java
         }
     }
diff --git a/annotation/src/main/kotlin/com/github/pozo/KotlinBuilder.kt b/kotlin-builder-annotation/src/main/kotlin/com/github/pozo/KotlinBuilder.kt
similarity index 100%
rename from annotation/src/main/kotlin/com/github/pozo/KotlinBuilder.kt
rename to kotlin-builder-annotation/src/main/kotlin/com/github/pozo/KotlinBuilder.kt
diff --git a/builder-processor/build.gradle b/kotlin-builder-processor/build.gradle
similarity index 86%
rename from builder-processor/build.gradle
rename to kotlin-builder-processor/build.gradle
index f08fdfd..9efe9ea 100644
--- a/builder-processor/build.gradle
+++ b/kotlin-builder-processor/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-metadata-jvm:${kotlinxMetadataVersion}"
     implementation "com.google.auto.service:auto-service:${autoServiceVersion}"
     implementation "com.squareup:javapoet:${javaPoetVersion}"
-    implementation(project(':annotation'))
+    implementation(project(':kotlin-builder-annotation'))
 
     kapt "com.google.auto.service:auto-service:${autoServiceVersion}"
 
@@ -29,10 +29,6 @@ dependencies {
 publishing {
     publications {
         maven(MavenPublication) {
-            groupId = group
-            artifactId = 'kotlin-builder-processor'
-            version = version
-
             from components.java
         }
     }
diff --git a/builder-processor/src/main/kotlin/com/github/pozo/BuilderGenerator.kt b/kotlin-builder-processor/src/main/kotlin/com/github/pozo/BuilderGenerator.kt
similarity index 100%
rename from builder-processor/src/main/kotlin/com/github/pozo/BuilderGenerator.kt
rename to kotlin-builder-processor/src/main/kotlin/com/github/pozo/BuilderGenerator.kt
diff --git a/builder-processor/src/main/kotlin/com/github/pozo/BuilderProcessor.kt b/kotlin-builder-processor/src/main/kotlin/com/github/pozo/BuilderProcessor.kt
similarity index 100%
rename from builder-processor/src/main/kotlin/com/github/pozo/BuilderProcessor.kt
rename to kotlin-builder-processor/src/main/kotlin/com/github/pozo/BuilderProcessor.kt
diff --git a/processor/build.gradle b/mapstruct-kotlin-builder-processor/build.gradle
similarity index 67%
rename from processor/build.gradle
rename to mapstruct-kotlin-builder-processor/build.gradle
index 6d28bbc..9801db3 100644
--- a/processor/build.gradle
+++ b/mapstruct-kotlin-builder-processor/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.mapstruct:mapstruct-jdk8:${mapstructVersion}")
+    implementation("org.mapstruct:mapstruct:${mapstructVersion}")
     implementation "org.mapstruct:mapstruct-processor:${mapstructVersion}"
 
     testImplementation 'junit:junit:4.12'
@@ -19,10 +19,6 @@ dependencies {
 publishing {
     publications {
         maven(MavenPublication) {
-            groupId = group
-            artifactId = 'mapstruct-kotlin-builder-processor'
-            version = version
-
             from components.java
         }
     }
diff --git a/processor/src/main/java/com/github/pozo/KotlinBuilderProvider.java b/mapstruct-kotlin-builder-processor/src/main/java/com/github/pozo/KotlinBuilderProvider.java
similarity index 100%
rename from processor/src/main/java/com/github/pozo/KotlinBuilderProvider.java
rename to mapstruct-kotlin-builder-processor/src/main/java/com/github/pozo/KotlinBuilderProvider.java
diff --git a/processor/src/main/resources/META-INF/services/org.mapstruct.ap.spi.BuilderProvider b/mapstruct-kotlin-builder-processor/src/main/resources/META-INF/services/org.mapstruct.ap.spi.BuilderProvider
similarity index 100%
rename from processor/src/main/resources/META-INF/services/org.mapstruct.ap.spi.BuilderProvider
rename to mapstruct-kotlin-builder-processor/src/main/resources/META-INF/services/org.mapstruct.ap.spi.BuilderProvider
diff --git a/settings.gradle b/settings.gradle
index c2ccbde..4e5cebf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = 'mapstruct-kotlin'
-include 'annotation'
-include 'processor'
-include 'builder-processor'
\ No newline at end of file
+include 'kotlin-builder-annotation'
+include 'kotlin-builder-processor'
+include 'mapstruct-kotlin-builder-processor'
diff --git a/test/build.gradle b/test/build.gradle
index 36d6881..597aa71 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -38,7 +38,7 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation("com.github.pozo:kotlin-builder-annotation:${kotlinBuilderAnnotationVersion}")
-    implementation("org.mapstruct:mapstruct-jdk8:${mapstructVersion}")
+    implementation("org.mapstruct:mapstruct:${mapstructVersion}")
 
     kapt("com.github.pozo:kotlin-builder-processor:${kotlinBuilderProcessorVersion}")
     kapt("com.github.pozo:mapstruct-kotlin-builder-processor:${kotlinMapstructProcessorVersion}")