diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index ea8b06d..31bcd3d 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   kotlin("multiplatform") version "2.0.0"
-  id("io.github.nomisrev.openapi.plugin") version "1.0.0"
+  id("io.github.nomisrev.openapi-kt-plugin") version "0.0.2"
   kotlin("plugin.serialization") version "2.0.0"
 }
 
diff --git a/generation/build.gradle.kts b/generation/build.gradle.kts
index 48bd367..c08e80f 100644
--- a/generation/build.gradle.kts
+++ b/generation/build.gradle.kts
@@ -5,8 +5,6 @@ plugins {
   alias(libs.plugins.serialization)
   id(libs.plugins.publish.get().pluginId)
   alias(libs.plugins.dokka)
-// Failing on Interceptors.kt
-//  alias(libs.plugins.spotless)
 }
 
 kotlin {
diff --git a/parser/build.gradle.kts b/parser/build.gradle.kts
index 4bf0945..5b7fa05 100644
--- a/parser/build.gradle.kts
+++ b/parser/build.gradle.kts
@@ -1,27 +1,12 @@
-import com.diffplug.gradle.spotless.SpotlessExtension
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 
 plugins {
   id(libs.plugins.multiplatform.get().pluginId)
   alias(libs.plugins.serialization)
   id(libs.plugins.publish.get().pluginId)
-  alias(libs.plugins.spotless)
   alias(libs.plugins.dokka)
 }
 
-configure<SpotlessExtension> {
-  kotlin {
-    target("**/*.kt")
-    ktfmt().kotlinlangStyle().configure {
-      it.setBlockIndent(2)
-      it.setContinuationIndent(2)
-      it.setRemoveUnusedImport(true)
-    }
-    trimTrailingWhitespace()
-    endWithNewline()
-  }
-}
-
 kotlin {
   explicitApi()
 
@@ -55,4 +40,4 @@ tasks.withType<DokkaTaskPartial>().configureEach {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/gradle-plugin/README.MD b/plugin/README.MD
similarity index 100%
rename from gradle-plugin/README.MD
rename to plugin/README.MD
diff --git a/gradle-plugin/build.gradle.kts b/plugin/build.gradle.kts
similarity index 96%
rename from gradle-plugin/build.gradle.kts
rename to plugin/build.gradle.kts
index 0c3385e..3ee8489 100644
--- a/gradle-plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -23,7 +23,7 @@ gradlePlugin {
     create(property("ID").toString()) {
       id = property("ID").toString()
       implementationClass = property("IMPLEMENTATION_CLASS").toString()
-      version = property("VERSION").toString()
+      version = properties["version"].toString()
       description = property("DESCRIPTION").toString()
       displayName = property("DISPLAY_NAME").toString()
       @Suppress("UnstableApiUsage")
diff --git a/gradle-plugin/gradle.properties b/plugin/gradle.properties
similarity index 88%
rename from gradle-plugin/gradle.properties
rename to plugin/gradle.properties
index d504d93..1973df1 100644
--- a/gradle-plugin/gradle.properties
+++ b/plugin/gradle.properties
@@ -1,5 +1,4 @@
-ID=io.github.nomisrev.openapi.plugin
-VERSION=1.0.0
+ID=io.github.nomisrev.openapi-kt-plugin
 GROUP=io.github.nomisrev.openapi
 DISPLAY_NAME=A Gradle plugin for OpenAPI-kt code generation
 DESCRIPTION=A Gradle plugin for OpenAPI-kt code generation
diff --git a/gradle-plugin/settings.gradle.kts b/plugin/settings.gradle.kts
similarity index 100%
rename from gradle-plugin/settings.gradle.kts
rename to plugin/settings.gradle.kts
diff --git a/gradle-plugin/src/main/java/io/github/nomisrev/openapi/plugin/GenerateClientTask.kt b/plugin/src/main/java/io/github/nomisrev/openapi/plugin/GenerateClientTask.kt
similarity index 100%
rename from gradle-plugin/src/main/java/io/github/nomisrev/openapi/plugin/GenerateClientTask.kt
rename to plugin/src/main/java/io/github/nomisrev/openapi/plugin/GenerateClientTask.kt
diff --git a/gradle-plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenAPIPlugin.kt b/plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenAPIPlugin.kt
similarity index 100%
rename from gradle-plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenAPIPlugin.kt
rename to plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenAPIPlugin.kt
diff --git a/gradle-plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenApiConfig.kt b/plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenApiConfig.kt
similarity index 100%
rename from gradle-plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenApiConfig.kt
rename to plugin/src/main/java/io/github/nomisrev/openapi/plugin/OpenApiConfig.kt
diff --git a/gradle-plugin/src/test/java/io/github/nomisrev/openapi/plugin/TemplatePluginTest.kt b/plugin/src/test/java/io/github/nomisrev/openapi/plugin/TemplatePluginTest.kt
similarity index 82%
rename from gradle-plugin/src/test/java/io/github/nomisrev/openapi/plugin/TemplatePluginTest.kt
rename to plugin/src/test/java/io/github/nomisrev/openapi/plugin/TemplatePluginTest.kt
index e242eb3..f1838dc 100644
--- a/gradle-plugin/src/test/java/io/github/nomisrev/openapi/plugin/TemplatePluginTest.kt
+++ b/plugin/src/test/java/io/github/nomisrev/openapi/plugin/TemplatePluginTest.kt
@@ -9,21 +9,21 @@ class TemplatePluginTest {
   @Test
   fun `plugin is applied correctly to the project`() {
     val project = ProjectBuilder.builder().build()
-    project.pluginManager.apply("io.github.nomisrev.openapi.plugin")
+    project.pluginManager.apply("io.github.nomisrev.openapi-kt-plugin")
     assert(project.tasks.getByName("generateOpenApiClient") is GenerateClientTask)
   }
 
   @Test
   fun `extension openApiConfig is created correctly`() {
     val project = ProjectBuilder.builder().build()
-    project.pluginManager.apply("io.github.nomisrev.openapi.plugin")
+    project.pluginManager.apply("io.github.nomisrev.openapi-kt-plugin")
     assert(project.extensions.getByName("openApiConfig") is OpenApiConfig)
   }
 
   @Test
   fun `parameters are passed correctly from extension to task`() {
     val project = ProjectBuilder.builder().build()
-    project.pluginManager.apply("io.github.nomisrev.openapi.plugin")
+    project.pluginManager.apply("io.github.nomisrev.openapi-kt-plugin")
     val input = File(project.projectDir, "input.tmp")
     (project.extensions.getByName("openApiConfig") as OpenApiConfig).apply { spec.set(input) }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4c4f4d2..a5fcf9e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,5 +21,5 @@ gradleEnterprise {
 include("parser")
 include("typed")
 include("generation")
-include("gradle-plugin")
+include("plugin")
 //include("generic")
diff --git a/typed/build.gradle.kts b/typed/build.gradle.kts
index 13db781..efb7b20 100644
--- a/typed/build.gradle.kts
+++ b/typed/build.gradle.kts
@@ -1,27 +1,12 @@
-import com.diffplug.gradle.spotless.SpotlessExtension
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 
 plugins {
   id(libs.plugins.multiplatform.get().pluginId)
   alias(libs.plugins.serialization)
   id(libs.plugins.publish.get().pluginId)
-  alias(libs.plugins.spotless)
   alias(libs.plugins.dokka)
 }
 
-configure<SpotlessExtension> {
-  kotlin {
-    target("**/*.kt")
-    ktfmt().kotlinlangStyle().configure {
-      it.setBlockIndent(2)
-      it.setContinuationIndent(2)
-      it.setRemoveUnusedImport(true)
-    }
-    trimTrailingWhitespace()
-    endWithNewline()
-  }
-}
-
 kotlin {
   jvm()
   macosArm64()
@@ -49,4 +34,4 @@ tasks.withType<DokkaTaskPartial>().configureEach {
       }
     }
   }
-}
\ No newline at end of file
+}