diff --git a/.idea/kotlinTestDataPluginTestDataPaths.xml b/.idea/kotlinTestDataPluginTestDataPaths.xml
index c80203da0c7..8c0c29e9dd1 100644
--- a/.idea/kotlinTestDataPluginTestDataPaths.xml
+++ b/.idea/kotlinTestDataPluginTestDataPaths.xml
@@ -73,11 +73,11 @@
         <option value="$PROJECT_DIR$/plugins/kapt3/kapt3-cli/testData" />
         <option value="$PROJECT_DIR$/plugins/kapt3/kapt3-compiler/testData" />
         <option value="$PROJECT_DIR$/plugins/kotlin-serialization/kotlin-serialization-compiler/testData" />
-        <option value="$PROJECT_DIR$/plugins/lombok/lombok-compiler-plugin/testData" />
         <option value="$PROJECT_DIR$/plugins/noarg/testData" />
         <option value="$PROJECT_DIR$/plugins/parcelize/parcelize-compiler/testData" />
         <option value="$PROJECT_DIR$/plugins/sam-with-receiver/sam-with-receiver-cli/testData" />
+        <option value="$PROJECT_DIR$/plugins/lombok/testData" />
       </array>
     </option>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index 2f87e8dcf13..2ae25ccaf8b 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -65,7 +65,7 @@ dependencies {
     testApi(projectTests(":kotlin-annotation-processing-cli"))
     testApi(projectTests(":kotlin-allopen-compiler-plugin"))
     testApi(projectTests(":kotlin-noarg-compiler-plugin"))
-    testApi(projectTests(":plugins:lombok:lombok-compiler-plugin"))
+    testApi(projectTests(":kotlin-lombok-compiler-plugin"))
     testApi(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
     testApi(projectTests(":kotlinx-serialization-compiler-plugin"))
     testApi(projectTests(":kotlinx-atomicfu-compiler-plugin"))
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 9d108ed2c4a..d3efe9ea171 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -248,7 +248,7 @@ fun main(args: Array<String>) {
             }
         }
 
-        testGroup("plugins/lombok/lombok-compiler-plugin/tests", "plugins/lombok/lombok-compiler-plugin/testData") {
+        testGroup("plugins/lombok/tests-gen", "plugins/lombok/testData") {
             testClass<AbstractLombokCompileTest> {
                 model("compile")
             }
diff --git a/libraries/tools/kotlin-lombok/build.gradle.kts b/libraries/tools/kotlin-lombok/build.gradle.kts
index 205cf9b24e8..d0351d10ad4 100644
--- a/libraries/tools/kotlin-lombok/build.gradle.kts
+++ b/libraries/tools/kotlin-lombok/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    embedded(project(":plugins:lombok:lombok-compiler-plugin")) { isTransitive = false }
+    embedded(project(":kotlin-lombok-compiler-plugin")) { isTransitive = false }
 
     commonApi(project(":kotlin-gradle-plugin-model"))
 }
diff --git a/plugins/lombok/lombok-compiler-plugin/README.md b/plugins/lombok/README.md
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/README.md
rename to plugins/lombok/README.md
diff --git a/plugins/lombok/lombok-compiler-plugin/build.gradle.kts b/plugins/lombok/build.gradle.kts
similarity index 51%
rename from plugins/lombok/lombok-compiler-plugin/build.gradle.kts
rename to plugins/lombok/build.gradle.kts
index 96226ab7cae..71adf816cf5 100644
--- a/plugins/lombok/lombok-compiler-plugin/build.gradle.kts
+++ b/plugins/lombok/build.gradle.kts
@@ -6,16 +6,15 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":compiler:util"))
-    implementation(project(":compiler:cli"))
-    implementation(project(":compiler:plugin-api"))
-    implementation(project(":compiler:frontend"))
-    implementation(project(":compiler:frontend.java"))
-
-    compileOnly(intellijCore())
-
+    embedded(project(":kotlin-lombok-compiler-plugin.common"))
+    embedded(project(":kotlin-lombok-compiler-plugin.k1"))
+    embedded(project(":kotlin-lombok-compiler-plugin.cli"))
 
     testImplementation(intellijCore())
+    testImplementation(project(":kotlin-lombok-compiler-plugin.common"))
+    testImplementation(project(":kotlin-lombok-compiler-plugin.k1"))
+    testImplementation(project(":kotlin-lombok-compiler-plugin.cli"))
+
     testImplementation(commonDependency("junit:junit"))
     testImplementation(projectTests(":compiler:tests-common"))
 
@@ -25,8 +24,11 @@ dependencies {
 }
 
 sourceSets {
-    "main" { projectDefault() }
-    "test" { projectDefault() }
+    "main" { none() }
+    "test" {
+        projectDefault()
+        generatedTestDir()
+    }
 }
 
 projectTest(parallel = true) {
@@ -35,7 +37,6 @@ projectTest(parallel = true) {
 }
 
 runtimeJar()
-testsJar()
-
 sourcesJar()
 javadocJar()
+testsJar()
diff --git a/plugins/lombok/lombok.cli/build.gradle.kts b/plugins/lombok/lombok.cli/build.gradle.kts
new file mode 100644
index 00000000000..29af743bda4
--- /dev/null
+++ b/plugins/lombok/lombok.cli/build.gradle.kts
@@ -0,0 +1,28 @@
+description = "Lombok compiler plugin (CLI)"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(project(":compiler:util"))
+    compileOnly(project(":compiler:cli"))
+    compileOnly(project(":compiler:plugin-api"))
+    compileOnly(project(":compiler:frontend"))
+    compileOnly(project(":compiler:frontend.java"))
+
+    implementation(project(":kotlin-lombok-compiler-plugin.common"))
+    implementation(project(":kotlin-lombok-compiler-plugin.k1"))
+
+    compileOnly(intellijCore())
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}
+
+runtimeJar()
+sourcesJar()
+javadocJar()
diff --git a/plugins/lombok/lombok-compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/plugins/lombok/lombok.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
rename to plugins/lombok/lombok.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
diff --git a/plugins/lombok/lombok-compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/plugins/lombok/lombok.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
rename to plugins/lombok/lombok.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokPlugin.kt b/plugins/lombok/lombok.cli/src/org/jetbrains/kotlin/lombok/LombokPlugin.kt
similarity index 96%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokPlugin.kt
rename to plugins/lombok/lombok.cli/src/org/jetbrains/kotlin/lombok/LombokPlugin.kt
index 8a0351d4620..fccea967032 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokPlugin.kt
+++ b/plugins/lombok/lombok.cli/src/org/jetbrains/kotlin/lombok/LombokPlugin.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -40,8 +40,6 @@ class LombokComponentRegistrar : ComponentRegistrar {
     }
 }
 
-data class LombokPluginConfig(val configFile: File?)
-
 object LombokConfigurationKeys {
     val CONFIG_FILE: CompilerConfigurationKey<File> = CompilerConfigurationKey.create("lombok config file location")
 }
diff --git a/plugins/lombok/lombok.common/build.gradle.kts b/plugins/lombok/lombok.common/build.gradle.kts
new file mode 100644
index 00000000000..34187426925
--- /dev/null
+++ b/plugins/lombok/lombok.common/build.gradle.kts
@@ -0,0 +1,20 @@
+description = "Lombok compiler plugin (Common)"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(project(":core:compiler.common"))
+    compileOnly(project(":core:compiler.common.jvm"))
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}
+
+runtimeJar()
+sourcesJar()
+javadocJar()
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/AccessLevel.kt b/plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/config/AccessLevel.kt
similarity index 62%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/AccessLevel.kt
rename to plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/config/AccessLevel.kt
index 3b0ffc3b1fe..c6bf3dae049 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/AccessLevel.kt
+++ b/plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/config/AccessLevel.kt
@@ -1,15 +1,13 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.lombok.config
 
-import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.descriptors.java.JavaVisibilities
-import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
-
 
 enum class AccessLevel {
     PUBLIC, MODULE, PROTECTED, PACKAGE, PRIVATE,
@@ -17,18 +15,17 @@ enum class AccessLevel {
     /** Represents not generating anything or the complete lack of a method. */
     NONE;
 
-    fun toDescriptorVisibility(): DescriptorVisibility = toDescriptorVisibility(this)
+    fun toVisibility(): Visibility = toVisibility(this)
 
     companion object {
-        fun toDescriptorVisibility(v: AccessLevel): DescriptorVisibility {
-            val visibility = when (v) {
+        private fun toVisibility(v: AccessLevel): Visibility {
+            return when (v) {
                 PUBLIC -> Visibilities.Public
                 PROTECTED -> Visibilities.Protected
                 PACKAGE, MODULE -> JavaVisibilities.PackageVisibility
                 PRIVATE -> Visibilities.Private
                 NONE -> Visibilities.Private
             }
-            return JavaDescriptorVisibilities.toDescriptorVisibility(visibility)
         }
     }
 }
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/LombokConfig.kt b/plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/config/LombokConfig.kt
similarity index 97%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/LombokConfig.kt
rename to plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/config/LombokConfig.kt
index 9f5f74e9ffc..1eeca9adc92 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/LombokConfig.kt
+++ b/plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/config/LombokConfig.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/LombokNames.kt b/plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/utils/LombokNames.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/LombokNames.kt
rename to plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/utils/LombokNames.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/utils.kt b/plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/utils/utils.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/utils.kt
rename to plugins/lombok/lombok.common/src/org/jetbrains/kotlin/lombok/utils/utils.kt
diff --git a/plugins/lombok/lombok.k1/build.gradle.kts b/plugins/lombok/lombok.k1/build.gradle.kts
new file mode 100644
index 00000000000..c0bb809de27
--- /dev/null
+++ b/plugins/lombok/lombok.k1/build.gradle.kts
@@ -0,0 +1,26 @@
+description = "Lombok compiler plugin (K1)"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(project(":compiler:util"))
+    compileOnly(project(":compiler:cli"))
+    compileOnly(project(":compiler:frontend"))
+    compileOnly(project(":compiler:frontend.java"))
+
+    implementation(project(":kotlin-lombok-compiler-plugin.common"))
+
+    compileOnly(intellijCore())
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}
+
+runtimeJar()
+sourcesJar()
+javadocJar()
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokResolveExtension.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/LombokResolveExtension.kt
similarity index 83%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokResolveExtension.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/LombokResolveExtension.kt
index 6094ceca56f..78117e7159e 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokResolveExtension.kt
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/LombokResolveExtension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.lombok
 import org.jetbrains.kotlin.lombok.config.LombokConfig
 import org.jetbrains.kotlin.resolve.jvm.SyntheticJavaPartsProvider
 import org.jetbrains.kotlin.resolve.jvm.extensions.SyntheticJavaResolveExtension
+import java.io.File
 
 class LombokResolveExtension(pluginConfig: LombokPluginConfig) : SyntheticJavaResolveExtension {
 
@@ -15,3 +16,5 @@ class LombokResolveExtension(pluginConfig: LombokPluginConfig) : SyntheticJavaRe
 
     override fun buildProvider(): SyntheticJavaPartsProvider = LombokSyntheticJavaPartsProvider(config)
 }
+
+data class LombokPluginConfig(val configFile: File?)
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokSyntheticJavaPartsProvider.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/LombokSyntheticJavaPartsProvider.kt
similarity index 98%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokSyntheticJavaPartsProvider.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/LombokSyntheticJavaPartsProvider.kt
index ed233710be2..c3f4159b1b0 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/LombokSyntheticJavaPartsProvider.kt
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/LombokSyntheticJavaPartsProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/config/AccessLevelUtils.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/config/AccessLevelUtils.kt
new file mode 100644
index 00000000000..5f97804ae7e
--- /dev/null
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/config/AccessLevelUtils.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.lombok.config
+
+import org.jetbrains.kotlin.descriptors.DescriptorVisibility
+import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
+
+fun AccessLevel.toDescriptorVisibility(): DescriptorVisibility {
+    return JavaDescriptorVisibilities.toDescriptorVisibility(toVisibility())
+}
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/annotationConfig.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/config/annotationConfig.kt
similarity index 97%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/annotationConfig.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/config/annotationConfig.kt
index 430264c3ffc..810ed7efe35 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/config/annotationConfig.kt
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/config/annotationConfig.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -88,7 +88,7 @@ object LombokAnnotations {
     }
 
     class Setter(val visibility: AccessLevel = AccessLevel.PUBLIC) {
-        companion object : AnnotationCompanion<Setter>( LombokNames.SETTER) {
+        companion object : AnnotationCompanion<Setter>(LombokNames.SETTER) {
 
             override fun extract(annotation: AnnotationDescriptor): Setter =
                 Setter(
@@ -116,7 +116,7 @@ object LombokAnnotations {
         override val visibility: DescriptorVisibility,
         override val staticName: String?
     ) : ConstructorAnnotation {
-        companion object : AnnotationCompanion<NoArgsConstructor>( LombokNames.NO_ARGS_CONSTRUCTOR) {
+        companion object : AnnotationCompanion<NoArgsConstructor>(LombokNames.NO_ARGS_CONSTRUCTOR) {
 
             override fun extract(annotation: AnnotationDescriptor): NoArgsConstructor =
                 NoArgsConstructor(
@@ -187,7 +187,6 @@ object LombokAnnotations {
                 Value(
                     staticConstructor = annotation.getNonBlankStringArgument("staticConstructor")
                 )
-
         }
     }
 }
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/AbstractConstructorProcessor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/AbstractConstructorProcessor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/AbstractConstructorProcessor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/AbstractConstructorProcessor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/AllArgsConstructorProcessor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/AllArgsConstructorProcessor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/AllArgsConstructorProcessor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/AllArgsConstructorProcessor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/GetterProcessor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/GetterProcessor.kt
similarity index 97%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/GetterProcessor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/GetterProcessor.kt
index 961632f1874..32cce19cb7d 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/GetterProcessor.kt
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/GetterProcessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/NoArgsConstructorProcessor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/NoArgsConstructorProcessor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/NoArgsConstructorProcessor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/NoArgsConstructorProcessor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/Processor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/Processor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/Processor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/Processor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/RequiredArgsConstructorProcessor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/RequiredArgsConstructorProcessor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/RequiredArgsConstructorProcessor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/RequiredArgsConstructorProcessor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/SetterProcessor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/SetterProcessor.kt
similarity index 97%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/SetterProcessor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/SetterProcessor.kt
index 5267709b353..5d90aecef1e 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/SetterProcessor.kt
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/SetterProcessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/SyntheticParts.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/SyntheticParts.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/SyntheticParts.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/SyntheticParts.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/WithProcessor.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/WithProcessor.kt
similarity index 92%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/WithProcessor.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/WithProcessor.kt
index 7248ed6abf4..6e9c9bb22b1 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/processor/WithProcessor.kt
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/processor/WithProcessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.kotlin.lombok.config.AccessLevel
 import org.jetbrains.kotlin.lombok.config.LombokAnnotations.With
+import org.jetbrains.kotlin.lombok.config.toDescriptorVisibility
 import org.jetbrains.kotlin.lombok.utils.*
 import org.jetbrains.kotlin.name.Name
 
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/annotationUtils.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/utils/annotationUtils.kt
similarity index 94%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/annotationUtils.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/utils/annotationUtils.kt
index 314f272559f..473b919db8e 100644
--- a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/annotationUtils.kt
+++ b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/utils/annotationUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.lombok.utils
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.lombok.config.AccessLevel
+import org.jetbrains.kotlin.lombok.config.toDescriptorVisibility
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.*
 
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/descriptorUtils.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/utils/descriptorUtils.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/descriptorUtils.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/utils/descriptorUtils.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/nameUtils.kt b/plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/utils/nameUtils.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/src/org/jetbrains/kotlin/lombok/utils/nameUtils.kt
rename to plugins/lombok/lombok.k1/src/org/jetbrains/kotlin/lombok/utils/nameUtils.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/common.kt b/plugins/lombok/testData/common.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/common.kt
rename to plugins/lombok/testData/common.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefix.kt b/plugins/lombok/testData/compile/accessorsStripPrefix.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefix.kt
rename to plugins/lombok/testData/compile/accessorsStripPrefix.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefixCombined.kt b/plugins/lombok/testData/compile/accessorsStripPrefixCombined.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefixCombined.kt
rename to plugins/lombok/testData/compile/accessorsStripPrefixCombined.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefixConfig.kt b/plugins/lombok/testData/compile/accessorsStripPrefixConfig.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefixConfig.kt
rename to plugins/lombok/testData/compile/accessorsStripPrefixConfig.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/allArgsConstructor.kt b/plugins/lombok/testData/compile/allArgsConstructor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/allArgsConstructor.kt
rename to plugins/lombok/testData/compile/allArgsConstructor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/allArgsConstructorStatic.kt b/plugins/lombok/testData/compile/allArgsConstructorStatic.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/allArgsConstructorStatic.kt
rename to plugins/lombok/testData/compile/allArgsConstructorStatic.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/clashAccessors.kt b/plugins/lombok/testData/compile/clashAccessors.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/clashAccessors.kt
rename to plugins/lombok/testData/compile/clashAccessors.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/configAccessors.kt b/plugins/lombok/testData/compile/configAccessors.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/configAccessors.kt
rename to plugins/lombok/testData/compile/configAccessors.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/configAccessorsOverride.kt b/plugins/lombok/testData/compile/configAccessorsOverride.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/configAccessorsOverride.kt
rename to plugins/lombok/testData/compile/configAccessorsOverride.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/configCaseInsensitive.kt b/plugins/lombok/testData/compile/configCaseInsensitive.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/configCaseInsensitive.kt
rename to plugins/lombok/testData/compile/configCaseInsensitive.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/configSimple.kt b/plugins/lombok/testData/compile/configSimple.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/configSimple.kt
rename to plugins/lombok/testData/compile/configSimple.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/data.kt b/plugins/lombok/testData/compile/data.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/data.kt
rename to plugins/lombok/testData/compile/data.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/genericsAccessors.kt b/plugins/lombok/testData/compile/genericsAccessors.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/genericsAccessors.kt
rename to plugins/lombok/testData/compile/genericsAccessors.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/genericsConstructors.kt b/plugins/lombok/testData/compile/genericsConstructors.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/genericsConstructors.kt
rename to plugins/lombok/testData/compile/genericsConstructors.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/genericsConstructorsStatic.kt b/plugins/lombok/testData/compile/genericsConstructorsStatic.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/genericsConstructorsStatic.kt
rename to plugins/lombok/testData/compile/genericsConstructorsStatic.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/getters.kt b/plugins/lombok/testData/compile/getters.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/getters.kt
rename to plugins/lombok/testData/compile/getters.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/gettersClassLevel.kt b/plugins/lombok/testData/compile/gettersClassLevel.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/gettersClassLevel.kt
rename to plugins/lombok/testData/compile/gettersClassLevel.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/gettersFluent.kt b/plugins/lombok/testData/compile/gettersFluent.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/gettersFluent.kt
rename to plugins/lombok/testData/compile/gettersFluent.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/noArgsConstructor.kt b/plugins/lombok/testData/compile/noArgsConstructor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/noArgsConstructor.kt
rename to plugins/lombok/testData/compile/noArgsConstructor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/noArgsConstructorStatic.kt b/plugins/lombok/testData/compile/noArgsConstructorStatic.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/noArgsConstructorStatic.kt
rename to plugins/lombok/testData/compile/noArgsConstructorStatic.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/nullability.kt b/plugins/lombok/testData/compile/nullability.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/nullability.kt
rename to plugins/lombok/testData/compile/nullability.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/processErrors/annotationTypes.kt b/plugins/lombok/testData/compile/processErrors/annotationTypes.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/processErrors/annotationTypes.kt
rename to plugins/lombok/testData/compile/processErrors/annotationTypes.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/propertyFromSuper.kt b/plugins/lombok/testData/compile/propertyFromSuper.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/propertyFromSuper.kt
rename to plugins/lombok/testData/compile/propertyFromSuper.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/requiredArgsConstructor.kt b/plugins/lombok/testData/compile/requiredArgsConstructor.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/requiredArgsConstructor.kt
rename to plugins/lombok/testData/compile/requiredArgsConstructor.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/requiredArgsConstructorStatic.kt b/plugins/lombok/testData/compile/requiredArgsConstructorStatic.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/requiredArgsConstructorStatic.kt
rename to plugins/lombok/testData/compile/requiredArgsConstructorStatic.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/setters.kt b/plugins/lombok/testData/compile/setters.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/setters.kt
rename to plugins/lombok/testData/compile/setters.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/settersClassLevel.kt b/plugins/lombok/testData/compile/settersClassLevel.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/settersClassLevel.kt
rename to plugins/lombok/testData/compile/settersClassLevel.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/settersVariations.kt b/plugins/lombok/testData/compile/settersVariations.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/settersVariations.kt
rename to plugins/lombok/testData/compile/settersVariations.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/simple.kt b/plugins/lombok/testData/compile/simple.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/simple.kt
rename to plugins/lombok/testData/compile/simple.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/value.kt b/plugins/lombok/testData/compile/value.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/value.kt
rename to plugins/lombok/testData/compile/value.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/testData/compile/with.kt b/plugins/lombok/testData/compile/with.kt
similarity index 100%
rename from plugins/lombok/lombok-compiler-plugin/testData/compile/with.kt
rename to plugins/lombok/testData/compile/with.kt
diff --git a/plugins/lombok/lombok-compiler-plugin/tests/org/jetbrains/kotlin/lombok/LombokCompileTestGenerated.java b/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/LombokCompileTestGenerated.java
similarity index 59%
rename from plugins/lombok/lombok-compiler-plugin/tests/org/jetbrains/kotlin/lombok/LombokCompileTestGenerated.java
rename to plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/LombokCompileTestGenerated.java
index 79829f5777c..2c70f041e6a 100644
--- a/plugins/lombok/lombok-compiler-plugin/tests/org/jetbrains/kotlin/lombok/LombokCompileTestGenerated.java
+++ b/plugins/lombok/tests-gen/org/jetbrains/kotlin/lombok/LombokCompileTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("plugins/lombok/lombok-compiler-plugin/testData/compile")
+@TestMetadata("plugins/lombok/testData/compile")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class LombokCompileTestGenerated extends AbstractLombokCompileTest {
@@ -27,154 +27,154 @@ public class LombokCompileTestGenerated extends AbstractLombokCompileTest {
 
     @TestMetadata("accessorsStripPrefix.kt")
     public void testAccessorsStripPrefix() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefix.kt");
+        runTest("plugins/lombok/testData/compile/accessorsStripPrefix.kt");
     }
 
     @TestMetadata("accessorsStripPrefixCombined.kt")
     public void testAccessorsStripPrefixCombined() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefixCombined.kt");
+        runTest("plugins/lombok/testData/compile/accessorsStripPrefixCombined.kt");
     }
 
     @TestMetadata("accessorsStripPrefixConfig.kt")
     public void testAccessorsStripPrefixConfig() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/accessorsStripPrefixConfig.kt");
+        runTest("plugins/lombok/testData/compile/accessorsStripPrefixConfig.kt");
     }
 
     @TestMetadata("allArgsConstructor.kt")
     public void testAllArgsConstructor() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/allArgsConstructor.kt");
+        runTest("plugins/lombok/testData/compile/allArgsConstructor.kt");
     }
 
     @TestMetadata("allArgsConstructorStatic.kt")
     public void testAllArgsConstructorStatic() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/allArgsConstructorStatic.kt");
+        runTest("plugins/lombok/testData/compile/allArgsConstructorStatic.kt");
     }
 
     public void testAllFilesPresentInCompile() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/lombok/lombok-compiler-plugin/testData/compile"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/lombok/testData/compile"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
     @TestMetadata("clashAccessors.kt")
     public void testClashAccessors() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/clashAccessors.kt");
+        runTest("plugins/lombok/testData/compile/clashAccessors.kt");
     }
 
     @TestMetadata("configAccessors.kt")
     public void testConfigAccessors() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/configAccessors.kt");
+        runTest("plugins/lombok/testData/compile/configAccessors.kt");
     }
 
     @TestMetadata("configAccessorsOverride.kt")
     public void testConfigAccessorsOverride() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/configAccessorsOverride.kt");
+        runTest("plugins/lombok/testData/compile/configAccessorsOverride.kt");
     }
 
     @TestMetadata("configCaseInsensitive.kt")
     public void testConfigCaseInsensitive() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/configCaseInsensitive.kt");
+        runTest("plugins/lombok/testData/compile/configCaseInsensitive.kt");
     }
 
     @TestMetadata("configSimple.kt")
     public void testConfigSimple() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/configSimple.kt");
+        runTest("plugins/lombok/testData/compile/configSimple.kt");
     }
 
     @TestMetadata("data.kt")
     public void testData() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/data.kt");
+        runTest("plugins/lombok/testData/compile/data.kt");
     }
 
     @TestMetadata("genericsAccessors.kt")
     public void testGenericsAccessors() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/genericsAccessors.kt");
+        runTest("plugins/lombok/testData/compile/genericsAccessors.kt");
     }
 
     @TestMetadata("genericsConstructors.kt")
     public void testGenericsConstructors() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/genericsConstructors.kt");
+        runTest("plugins/lombok/testData/compile/genericsConstructors.kt");
     }
 
     @TestMetadata("genericsConstructorsStatic.kt")
     public void testGenericsConstructorsStatic() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/genericsConstructorsStatic.kt");
+        runTest("plugins/lombok/testData/compile/genericsConstructorsStatic.kt");
     }
 
     @TestMetadata("getters.kt")
     public void testGetters() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/getters.kt");
+        runTest("plugins/lombok/testData/compile/getters.kt");
     }
 
     @TestMetadata("gettersClassLevel.kt")
     public void testGettersClassLevel() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/gettersClassLevel.kt");
+        runTest("plugins/lombok/testData/compile/gettersClassLevel.kt");
     }
 
     @TestMetadata("gettersFluent.kt")
     public void testGettersFluent() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/gettersFluent.kt");
+        runTest("plugins/lombok/testData/compile/gettersFluent.kt");
     }
 
     @TestMetadata("noArgsConstructor.kt")
     public void testNoArgsConstructor() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/noArgsConstructor.kt");
+        runTest("plugins/lombok/testData/compile/noArgsConstructor.kt");
     }
 
     @TestMetadata("noArgsConstructorStatic.kt")
     public void testNoArgsConstructorStatic() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/noArgsConstructorStatic.kt");
+        runTest("plugins/lombok/testData/compile/noArgsConstructorStatic.kt");
     }
 
     @TestMetadata("nullability.kt")
     public void testNullability() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/nullability.kt");
+        runTest("plugins/lombok/testData/compile/nullability.kt");
     }
 
     @TestMetadata("propertyFromSuper.kt")
     public void testPropertyFromSuper() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/propertyFromSuper.kt");
+        runTest("plugins/lombok/testData/compile/propertyFromSuper.kt");
     }
 
     @TestMetadata("requiredArgsConstructor.kt")
     public void testRequiredArgsConstructor() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/requiredArgsConstructor.kt");
+        runTest("plugins/lombok/testData/compile/requiredArgsConstructor.kt");
     }
 
     @TestMetadata("requiredArgsConstructorStatic.kt")
     public void testRequiredArgsConstructorStatic() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/requiredArgsConstructorStatic.kt");
+        runTest("plugins/lombok/testData/compile/requiredArgsConstructorStatic.kt");
     }
 
     @TestMetadata("setters.kt")
     public void testSetters() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/setters.kt");
+        runTest("plugins/lombok/testData/compile/setters.kt");
     }
 
     @TestMetadata("settersClassLevel.kt")
     public void testSettersClassLevel() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/settersClassLevel.kt");
+        runTest("plugins/lombok/testData/compile/settersClassLevel.kt");
     }
 
     @TestMetadata("settersVariations.kt")
     public void testSettersVariations() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/settersVariations.kt");
+        runTest("plugins/lombok/testData/compile/settersVariations.kt");
     }
 
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/simple.kt");
+        runTest("plugins/lombok/testData/compile/simple.kt");
     }
 
     @TestMetadata("value.kt")
     public void testValue() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/value.kt");
+        runTest("plugins/lombok/testData/compile/value.kt");
     }
 
     @TestMetadata("with.kt")
     public void testWith() throws Exception {
-        runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/with.kt");
+        runTest("plugins/lombok/testData/compile/with.kt");
     }
 
-    @TestMetadata("plugins/lombok/lombok-compiler-plugin/testData/compile/processErrors")
+    @TestMetadata("plugins/lombok/testData/compile/processErrors")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ProcessErrors extends AbstractLombokCompileTest {
@@ -183,12 +183,12 @@ public class LombokCompileTestGenerated extends AbstractLombokCompileTest {
         }
 
         public void testAllFilesPresentInProcessErrors() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/lombok/lombok-compiler-plugin/testData/compile/processErrors"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/lombok/testData/compile/processErrors"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
         @TestMetadata("annotationTypes.kt")
         public void testAnnotationTypes() throws Exception {
-            runTest("plugins/lombok/lombok-compiler-plugin/testData/compile/processErrors/annotationTypes.kt");
+            runTest("plugins/lombok/testData/compile/processErrors/annotationTypes.kt");
         }
     }
 }
diff --git a/plugins/lombok/lombok-compiler-plugin/tests/org/jetbrains/kotlin/lombok/AbstractLombokCompileTest.kt b/plugins/lombok/tests/org/jetbrains/kotlin/lombok/AbstractLombokCompileTest.kt
similarity index 96%
rename from plugins/lombok/lombok-compiler-plugin/tests/org/jetbrains/kotlin/lombok/AbstractLombokCompileTest.kt
rename to plugins/lombok/tests/org/jetbrains/kotlin/lombok/AbstractLombokCompileTest.kt
index 090101e63cb..d24a14a148b 100644
--- a/plugins/lombok/lombok-compiler-plugin/tests/org/jetbrains/kotlin/lombok/AbstractLombokCompileTest.kt
+++ b/plugins/lombok/tests/org/jetbrains/kotlin/lombok/AbstractLombokCompileTest.kt
@@ -20,7 +20,7 @@ abstract class AbstractLombokCompileTest : CodegenTestCase() {
     private val commonClassLoader = URLClassLoader(arrayOf(getLombokJar().toURI().toURL()))
     private val commonSourceFile = TestFile(
         "common.kt",
-        File("plugins/lombok/lombok-compiler-plugin/testData/common.kt").readText()
+        File("plugins/lombok/testData/common.kt").readText()
     )
 
     override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 0ff78ca09cf..fbcac17374f 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -115,7 +115,7 @@ val distCompilerPluginProjects = listOf(
     ":kotlin-noarg-compiler-plugin",
     ":kotlin-sam-with-receiver-compiler-plugin",
     ":kotlinx-serialization-compiler-plugin",
-    ":plugins:lombok:lombok-compiler-plugin"
+    ":kotlin-lombok-compiler-plugin"
 )
 
 val distSourcesProjects = listOfNotNull(
diff --git a/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts
index 11d8f02fdf8..828b5d51eda 100644
--- a/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/lombok-compiler-plugin-for-ide/build.gradle.kts
@@ -2,4 +2,4 @@ plugins {
     kotlin("jvm")
 }
 
-publishJarsForIde(listOf(":plugins:lombok:lombok-compiler-plugin"))
+publishJarsForIde(listOf(":kotlin-lombok-compiler-plugin.k1", ":kotlin-lombok-compiler-plugin.common"))
diff --git a/settings.gradle b/settings.gradle
index 364368756c4..d6e3c183c70 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -352,7 +352,10 @@ include ":plugins:parcelize:parcelize-compiler",
         ":plugins:parcelize:parcelize-runtime",
         ":kotlin-parcelize-compiler"
 
-include ":plugins:lombok:lombok-compiler-plugin",
+include ":kotlin-lombok-compiler-plugin",
+        ":kotlin-lombok-compiler-plugin.common",
+        ":kotlin-lombok-compiler-plugin.k1",
+        ":kotlin-lombok-compiler-plugin.cli",
         ":kotlin-lombok"
 
 if (!buildProperties.inJpsBuildIdeaSync) {
@@ -687,15 +690,23 @@ project(':plugins:android-extensions-compiler').projectDir = "$rootDir/plugins/a
 project(':kotlin-android-extensions').projectDir = "$rootDir/prepare/android-extensions-compiler-gradle" as File
 project(':kotlin-parcelize-compiler').projectDir = "$rootDir/prepare/parcelize-compiler-gradle" as File
 project(':kotlin-android-extensions-runtime').projectDir = "$rootDir/plugins/android-extensions/android-extensions-runtime" as File
+
 project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen" as File
 project(':kotlin-allopen-compiler-plugin.cli').projectDir = "$rootDir/plugins/allopen/allopen.cli" as File
 project(':kotlin-allopen-compiler-plugin.k1').projectDir = "$rootDir/plugins/allopen/allopen.k1" as File
 project(':kotlin-allopen-compiler-plugin.k2').projectDir = "$rootDir/plugins/allopen/allopen.k2" as File
+
+project(':kotlin-lombok-compiler-plugin').projectDir = "$rootDir/plugins/lombok" as File
+project(':kotlin-lombok-compiler-plugin.cli').projectDir = "$rootDir/plugins/lombok/lombok.cli" as File
+project(':kotlin-lombok-compiler-plugin.k1').projectDir = "$rootDir/plugins/lombok/lombok.k1" as File
+project(':kotlin-lombok-compiler-plugin.common').projectDir = "$rootDir/plugins/lombok/lombok.common" as File
+
 project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg" as File
 project(':kotlin-noarg-compiler-plugin.k1').projectDir = "$rootDir/plugins/noarg/noarg.k1" as File
 project(':kotlin-noarg-compiler-plugin.k2').projectDir = "$rootDir/plugins/noarg/noarg.k2" as File
 project(':kotlin-noarg-compiler-plugin.backend').projectDir = "$rootDir/plugins/noarg/noarg.backend" as File
 project(':kotlin-noarg-compiler-plugin.cli').projectDir = "$rootDir/plugins/noarg/noarg.cli" as File
+
 project(':kotlin-sam-with-receiver-compiler-plugin').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-cli" as File
 project(':tools:kotlinp').projectDir = "$rootDir/libraries/tools/kotlinp" as File
 project(':kotlin-project-model').projectDir = "$rootDir/libraries/tools/kotlin-project-model" as File