diff --git a/.idea/kotlinTestDataPluginTestDataPaths.xml b/.idea/kotlinTestDataPluginTestDataPaths.xml
index e55df28b918..c80203da0c7 100644
--- a/.idea/kotlinTestDataPluginTestDataPaths.xml
+++ b/.idea/kotlinTestDataPluginTestDataPaths.xml
@@ -74,7 +74,7 @@
         <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/noarg-cli/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" />
       </array>
diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/build.gradle.kts
similarity index 50%
rename from plugins/noarg/noarg-cli/build.gradle.kts
rename to plugins/noarg/build.gradle.kts
index 77e8e29572a..0a5a66ed3ae 100644
--- a/plugins/noarg/noarg-cli/build.gradle.kts
+++ b/plugins/noarg/build.gradle.kts
@@ -1,4 +1,3 @@
-
 description = "Kotlin NoArg Compiler Plugin"
 
 plugins {
@@ -7,15 +6,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":compiler:frontend"))
-    compileOnly(project(":compiler:frontend.java"))
-    compileOnly(project(":compiler:backend"))
-    compileOnly(project(":compiler:util"))
-    compileOnly(project(":compiler:plugin-api"))
-    compileOnly(project(":compiler:ir.backend.common"))
-    compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
-    implementation(kotlinStdlib())
+    embedded(project(":kotlin-noarg-compiler-plugin.k1"))
+    embedded(project(":kotlin-noarg-compiler-plugin.backend"))
+    embedded(project(":kotlin-noarg-compiler-plugin.cli"))
 
     testApi(project(":compiler:backend"))
     testApi(project(":compiler:cli"))
@@ -25,16 +18,13 @@ dependencies {
 }
 
 sourceSets {
-    "main" { projectDefault() }
+    "main" { none() }
     "test" { projectDefault() }
 }
 
 runtimeJar()
-
 sourcesJar()
-
 javadocJar()
-
 testsJar()
 
 projectTest(parallel = true) {
diff --git a/plugins/noarg/noarg.backend/build.gradle.kts b/plugins/noarg/noarg.backend/build.gradle.kts
new file mode 100644
index 00000000000..2cc2d059718
--- /dev/null
+++ b/plugins/noarg/noarg.backend/build.gradle.kts
@@ -0,0 +1,23 @@
+description = "Kotlin NoArg Compiler Plugin (Backend)"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(project(":compiler:backend"))
+    compileOnly(project(":compiler:ir.backend.common"))
+    compileOnly(intellijCore())
+    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    implementation(kotlinStdlib())
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}
+
+runtimeJar()
+sourcesJar()
+javadocJar()
diff --git a/plugins/noarg/noarg-cli/src/AbstractNoArgExpressionCodegenExtension.kt b/plugins/noarg/noarg.backend/src/org/jetbrains/kotlin/noarg/AbstractNoArgExpressionCodegenExtension.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/src/AbstractNoArgExpressionCodegenExtension.kt
rename to plugins/noarg/noarg.backend/src/org/jetbrains/kotlin/noarg/AbstractNoArgExpressionCodegenExtension.kt
diff --git a/plugins/noarg/noarg-cli/src/NoArgIrGenerationExtension.kt b/plugins/noarg/noarg.backend/src/org/jetbrains/kotlin/noarg/NoArgIrGenerationExtension.kt
similarity index 97%
rename from plugins/noarg/noarg-cli/src/NoArgIrGenerationExtension.kt
rename to plugins/noarg/noarg.backend/src/org/jetbrains/kotlin/noarg/NoArgIrGenerationExtension.kt
index 4cbb2b5c666..000927acb71 100644
--- a/plugins/noarg/noarg-cli/src/NoArgIrGenerationExtension.kt
+++ b/plugins/noarg/noarg.backend/src/org/jetbrains/kotlin/noarg/NoArgIrGenerationExtension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2020 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.
  */
 
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
 import org.jetbrains.kotlin.name.JvmNames.JVM_OVERLOADS_FQ_NAME
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 
-internal class NoArgIrGenerationExtension(
+class NoArgIrGenerationExtension(
     private val annotations: List<String>,
     private val invokeInitializers: Boolean,
 ) : IrGenerationExtension {
diff --git a/plugins/noarg/noarg.cli/build.gradle.kts b/plugins/noarg/noarg.cli/build.gradle.kts
new file mode 100644
index 00000000000..98903a08ae1
--- /dev/null
+++ b/plugins/noarg/noarg.cli/build.gradle.kts
@@ -0,0 +1,25 @@
+description = "Kotlin NoArg Compiler Plugin (CLI)"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    api(project(":kotlin-noarg-compiler-plugin.k1"))
+    api(project(":kotlin-noarg-compiler-plugin.backend"))
+    compileOnly(project(":compiler:util"))
+    compileOnly(project(":compiler:plugin-api"))
+    compileOnly(project(":compiler:backend"))
+    compileOnly(project(":compiler:ir.backend.common"))
+    compileOnly(intellijCore())
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}
+
+runtimeJar()
+sourcesJar()
+javadocJar()
diff --git a/plugins/noarg/noarg-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/plugins/noarg/noarg.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
similarity index 100%
rename from plugins/noarg/noarg-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
rename to plugins/noarg/noarg.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
diff --git a/plugins/noarg/noarg-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/plugins/noarg/noarg.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
similarity index 100%
rename from plugins/noarg/noarg-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
rename to plugins/noarg/noarg.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
diff --git a/plugins/noarg/noarg-cli/src/NoArgPlugin.kt b/plugins/noarg/noarg.cli/src/org/jetbrains/kotlin/noarg/NoArgPlugin.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/src/NoArgPlugin.kt
rename to plugins/noarg/noarg.cli/src/org/jetbrains/kotlin/noarg/NoArgPlugin.kt
diff --git a/plugins/noarg/noarg.k1/build.gradle.kts b/plugins/noarg/noarg.k1/build.gradle.kts
new file mode 100644
index 00000000000..2b6602e8e1b
--- /dev/null
+++ b/plugins/noarg/noarg.k1/build.gradle.kts
@@ -0,0 +1,21 @@
+description = "Kotlin NoArg Compiler Plugin (K1)"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(project(":compiler:frontend"))
+    compileOnly(project(":compiler:frontend.java"))
+    compileOnly(intellijCore())
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { none() }
+}
+
+runtimeJar()
+sourcesJar()
+javadocJar()
diff --git a/plugins/noarg/noarg-cli/src/org/jetbrains/kotlin/noarg/diagnostic/CliNoArgDeclarationChecker.kt b/plugins/noarg/noarg.k1/src/org/jetbrains/kotlin/noarg/diagnostic/CliNoArgDeclarationChecker.kt
similarity index 78%
rename from plugins/noarg/noarg-cli/src/org/jetbrains/kotlin/noarg/diagnostic/CliNoArgDeclarationChecker.kt
rename to plugins/noarg/noarg.k1/src/org/jetbrains/kotlin/noarg/diagnostic/CliNoArgDeclarationChecker.kt
index 3b4e4622ddb..f72a0854c96 100644
--- a/plugins/noarg/noarg-cli/src/org/jetbrains/kotlin/noarg/diagnostic/CliNoArgDeclarationChecker.kt
+++ b/plugins/noarg/noarg.k1/src/org/jetbrains/kotlin/noarg/diagnostic/CliNoArgDeclarationChecker.kt
@@ -1,17 +1,6 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.noarg.diagnostic
@@ -28,7 +17,7 @@ import org.jetbrains.kotlin.resolve.checkers.DeclarationChecker
 import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassOrAny
 
-internal class CliNoArgDeclarationChecker(
+class CliNoArgDeclarationChecker(
     private val noArgAnnotationFqNames: List<String>,
     useIr: Boolean,
 ) : AbstractNoArgDeclarationChecker(useIr) {
diff --git a/plugins/noarg/noarg-cli/src/org/jetbrains/kotlin/noarg/diagnostic/DefaultErrorMessagesNoArg.kt b/plugins/noarg/noarg.k1/src/org/jetbrains/kotlin/noarg/diagnostic/DefaultErrorMessagesNoArg.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/src/org/jetbrains/kotlin/noarg/diagnostic/DefaultErrorMessagesNoArg.kt
rename to plugins/noarg/noarg.k1/src/org/jetbrains/kotlin/noarg/diagnostic/DefaultErrorMessagesNoArg.kt
diff --git a/plugins/noarg/noarg-cli/src/org/jetbrains/kotlin/noarg/diagnostic/ErrorsNoArg.java b/plugins/noarg/noarg.k1/src/org/jetbrains/kotlin/noarg/diagnostic/ErrorsNoArg.java
similarity index 100%
rename from plugins/noarg/noarg-cli/src/org/jetbrains/kotlin/noarg/diagnostic/ErrorsNoArg.java
rename to plugins/noarg/noarg.k1/src/org/jetbrains/kotlin/noarg/diagnostic/ErrorsNoArg.java
diff --git a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/BlackBoxCodegenTestForNoArgGenerated.java b/plugins/noarg/test/org/jetbrains/kotlin/noarg/BlackBoxCodegenTestForNoArgGenerated.java
similarity index 100%
rename from plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/BlackBoxCodegenTestForNoArgGenerated.java
rename to plugins/noarg/test/org/jetbrains/kotlin/noarg/BlackBoxCodegenTestForNoArgGenerated.java
diff --git a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/BytecodeListingTestForNoArgGenerated.java b/plugins/noarg/test/org/jetbrains/kotlin/noarg/BytecodeListingTestForNoArgGenerated.java
similarity index 100%
rename from plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/BytecodeListingTestForNoArgGenerated.java
rename to plugins/noarg/test/org/jetbrains/kotlin/noarg/BytecodeListingTestForNoArgGenerated.java
diff --git a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/DiagnosticsTestForNoArgGenerated.java b/plugins/noarg/test/org/jetbrains/kotlin/noarg/DiagnosticsTestForNoArgGenerated.java
similarity index 100%
rename from plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/DiagnosticsTestForNoArgGenerated.java
rename to plugins/noarg/test/org/jetbrains/kotlin/noarg/DiagnosticsTestForNoArgGenerated.java
diff --git a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/IrBlackBoxCodegenTestForNoArgGenerated.java b/plugins/noarg/test/org/jetbrains/kotlin/noarg/IrBlackBoxCodegenTestForNoArgGenerated.java
similarity index 100%
rename from plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/IrBlackBoxCodegenTestForNoArgGenerated.java
rename to plugins/noarg/test/org/jetbrains/kotlin/noarg/IrBlackBoxCodegenTestForNoArgGenerated.java
diff --git a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/IrBytecodeListingTestForNoArgGenerated.java b/plugins/noarg/test/org/jetbrains/kotlin/noarg/IrBytecodeListingTestForNoArgGenerated.java
similarity index 100%
rename from plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/IrBytecodeListingTestForNoArgGenerated.java
rename to plugins/noarg/test/org/jetbrains/kotlin/noarg/IrBytecodeListingTestForNoArgGenerated.java
diff --git a/plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/NoArgTests.kt b/plugins/noarg/test/org/jetbrains/kotlin/noarg/NoArgTests.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/test/org/jetbrains/kotlin/noarg/NoArgTests.kt
rename to plugins/noarg/test/org/jetbrains/kotlin/noarg/NoArgTests.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/initializers.kt b/plugins/noarg/testData/box/initializers.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/initializers.kt
rename to plugins/noarg/testData/box/initializers.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/initializersWithoutInvokeInitializers.kt b/plugins/noarg/testData/box/initializersWithoutInvokeInitializers.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/initializersWithoutInvokeInitializers.kt
rename to plugins/noarg/testData/box/initializersWithoutInvokeInitializers.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/kt18245.kt b/plugins/noarg/testData/box/kt18245.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/kt18245.kt
rename to plugins/noarg/testData/box/kt18245.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/kt18667.kt b/plugins/noarg/testData/box/kt18667.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/kt18667.kt
rename to plugins/noarg/testData/box/kt18667.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/kt18668.kt b/plugins/noarg/testData/box/kt18668.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/kt18668.kt
rename to plugins/noarg/testData/box/kt18668.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/localClassInInitiailzer.kt b/plugins/noarg/testData/box/localClassInInitiailzer.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/localClassInInitiailzer.kt
rename to plugins/noarg/testData/box/localClassInInitiailzer.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/nestedClass.kt b/plugins/noarg/testData/box/nestedClass.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/nestedClass.kt
rename to plugins/noarg/testData/box/nestedClass.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/sealedClassWithExistingNoargCtor.kt b/plugins/noarg/testData/box/sealedClassWithExistingNoargCtor.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/sealedClassWithExistingNoargCtor.kt
rename to plugins/noarg/testData/box/sealedClassWithExistingNoargCtor.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/simple.kt b/plugins/noarg/testData/box/simple.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/simple.kt
rename to plugins/noarg/testData/box/simple.kt
diff --git a/plugins/noarg/noarg-cli/testData/box/subclass.kt b/plugins/noarg/testData/box/subclass.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/box/subclass.kt
rename to plugins/noarg/testData/box/subclass.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.kt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.kt
rename to plugins/noarg/testData/bytecodeListing/annoOnNotClass.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.txt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass.txt
rename to plugins/noarg/testData/bytecodeListing/annoOnNotClass.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass_ir.txt b/plugins/noarg/testData/bytecodeListing/annoOnNotClass_ir.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/annoOnNotClass_ir.txt
rename to plugins/noarg/testData/bytecodeListing/annoOnNotClass_ir.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/constructorVisibility.kt b/plugins/noarg/testData/bytecodeListing/constructorVisibility.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/constructorVisibility.kt
rename to plugins/noarg/testData/bytecodeListing/constructorVisibility.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/constructorVisibility.txt b/plugins/noarg/testData/bytecodeListing/constructorVisibility.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/constructorVisibility.txt
rename to plugins/noarg/testData/bytecodeListing/constructorVisibility.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/defaultParameters.kt b/plugins/noarg/testData/bytecodeListing/defaultParameters.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/defaultParameters.kt
rename to plugins/noarg/testData/bytecodeListing/defaultParameters.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/defaultParameters.txt b/plugins/noarg/testData/bytecodeListing/defaultParameters.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/defaultParameters.txt
rename to plugins/noarg/testData/bytecodeListing/defaultParameters.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/inherited.kt b/plugins/noarg/testData/bytecodeListing/inherited.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/inherited.kt
rename to plugins/noarg/testData/bytecodeListing/inherited.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/inherited.txt b/plugins/noarg/testData/bytecodeListing/inherited.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/inherited.txt
rename to plugins/noarg/testData/bytecodeListing/inherited.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/nestedClass.kt b/plugins/noarg/testData/bytecodeListing/nestedClass.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/nestedClass.kt
rename to plugins/noarg/testData/bytecodeListing/nestedClass.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/nestedClass.txt b/plugins/noarg/testData/bytecodeListing/nestedClass.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/nestedClass.txt
rename to plugins/noarg/testData/bytecodeListing/nestedClass.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/noNoArg.kt b/plugins/noarg/testData/bytecodeListing/noNoArg.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/noNoArg.kt
rename to plugins/noarg/testData/bytecodeListing/noNoArg.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/noNoArg.txt b/plugins/noarg/testData/bytecodeListing/noNoArg.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/noNoArg.txt
rename to plugins/noarg/testData/bytecodeListing/noNoArg.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/severalNoArg.kt b/plugins/noarg/testData/bytecodeListing/severalNoArg.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/severalNoArg.kt
rename to plugins/noarg/testData/bytecodeListing/severalNoArg.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/severalNoArg.txt b/plugins/noarg/testData/bytecodeListing/severalNoArg.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/severalNoArg.txt
rename to plugins/noarg/testData/bytecodeListing/severalNoArg.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/simple.kt b/plugins/noarg/testData/bytecodeListing/simple.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/simple.kt
rename to plugins/noarg/testData/bytecodeListing/simple.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/simple.txt b/plugins/noarg/testData/bytecodeListing/simple.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/simple.txt
rename to plugins/noarg/testData/bytecodeListing/simple.txt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/superTypes.kt b/plugins/noarg/testData/bytecodeListing/superTypes.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/superTypes.kt
rename to plugins/noarg/testData/bytecodeListing/superTypes.kt
diff --git a/plugins/noarg/noarg-cli/testData/bytecodeListing/superTypes.txt b/plugins/noarg/testData/bytecodeListing/superTypes.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/bytecodeListing/superTypes.txt
rename to plugins/noarg/testData/bytecodeListing/superTypes.txt
diff --git a/plugins/noarg/noarg-cli/testData/diagnostics/innerClass.kt b/plugins/noarg/testData/diagnostics/innerClass.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/diagnostics/innerClass.kt
rename to plugins/noarg/testData/diagnostics/innerClass.kt
diff --git a/plugins/noarg/noarg-cli/testData/diagnostics/innerClass.txt b/plugins/noarg/testData/diagnostics/innerClass.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/diagnostics/innerClass.txt
rename to plugins/noarg/testData/diagnostics/innerClass.txt
diff --git a/plugins/noarg/noarg-cli/testData/diagnostics/noNoargCtorInSuperclass.kt b/plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.kt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/diagnostics/noNoargCtorInSuperclass.kt
rename to plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.kt
diff --git a/plugins/noarg/noarg-cli/testData/diagnostics/noNoargCtorInSuperclass.txt b/plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.txt
similarity index 100%
rename from plugins/noarg/noarg-cli/testData/diagnostics/noNoargCtorInSuperclass.txt
rename to plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.txt
diff --git a/settings.gradle b/settings.gradle
index d75b09ce21f..034a5321cbb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -194,7 +194,11 @@ include ":kotlin-allopen-compiler-plugin",
         ":kotlin-allopen-compiler-plugin.k2"
 
 include ":kotlin-noarg-compiler-plugin",
-        ":kotlin-sam-with-receiver-compiler-plugin",
+        ":kotlin-noarg-compiler-plugin.k1",
+        ":kotlin-noarg-compiler-plugin.backend",
+        ":kotlin-noarg-compiler-plugin.cli"
+
+include ":kotlin-sam-with-receiver-compiler-plugin",
         ":kotlin-imports-dumper-compiler-plugin",
         ":kotlin-script-runtime",
         ":plugins:fir-plugin-prototype",
@@ -686,7 +690,10 @@ project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allope
 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-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg/noarg-cli" 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.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