diff --git a/libraries/tools/kotlin-noarg/build.gradle.kts b/libraries/tools/kotlin-noarg/build.gradle.kts
index 6516bcae5ae..bbc4987ffea 100644
--- a/libraries/tools/kotlin-noarg/build.gradle.kts
+++ b/libraries/tools/kotlin-noarg/build.gradle.kts
@@ -10,10 +10,10 @@ pill {
 }
 
 dependencies {
-    api(project(":kotlin-gradle-plugin-model"))
+    commonApi(project(":kotlin-gradle-plugin-model"))
 
-    compileOnly(project(":compiler"))
-    compileOnly(project(":kotlin-noarg-compiler-plugin"))
+    commonCompileOnly(project(":compiler"))
+    commonCompileOnly(project(":kotlin-noarg-compiler-plugin"))
 
     testImplementation(gradleApi())
     testImplementation(commonDependency("junit"))
diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt
rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/KotlinJpaSubplugin.kt
diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt
rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgExtension.kt
diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt
rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/builder/NoArgModelBuilder.kt
diff --git a/libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt
rename to libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/model/impl/NoArgImpl.kt
diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-jpa.properties b/libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-jpa.properties
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-jpa.properties
rename to libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-jpa.properties
diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-noarg.properties b/libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-noarg.properties
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/kotlin-noarg.properties
rename to libraries/tools/kotlin-noarg/src/common/resources/META-INF/gradle-plugins/kotlin-noarg.properties
diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin b/libraries/tools/kotlin-noarg/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
similarity index 100%
rename from libraries/tools/kotlin-noarg/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
rename to libraries/tools/kotlin-noarg/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin