diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 6cae8c35e9c..5422fa0e13a 100755
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -946,7 +946,7 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("plugins/kapt3/test", "plugins/kapt3/testData") {
+    testGroup("plugins/kapt3/kapt3-compiler/test", "plugins/kapt3/kapt3-compiler/testData") {
         testClass<AbstractClassFileToSourceStubConverterTest> {
             model("converter")
         }
diff --git a/plugins/kapt3/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
similarity index 75%
rename from plugins/kapt3/build.gradle.kts
rename to plugins/kapt3/kapt3-compiler/build.gradle.kts
index 32283db10b7..cdc9241eb2e 100644
--- a/plugins/kapt3/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -15,6 +15,8 @@ dependencies {
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(ideaSdkDeps("idea", "idea_rt", "openapi"))
     testCompile(commonDep("junit:junit"))
+
+    compileOnly(project(":kotlin-annotation-processing-runtime"))
 }
 
 sourceSets {
@@ -22,10 +24,15 @@ sourceSets {
     "test" { projectDefault() }
 }
 
+runtimeJar {
+    from(getSourceSetsFrom(":kotlin-annotation-processing-runtime")["main"].output.classesDirs)
+}
+
 testsJar {}
 
 projectTest {
     workingDir = rootDir
+    dependsOnTaskIfExistsRec("dist", project = rootProject)
 }
 
 runtimeJar()
diff --git a/plugins/kapt3/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/plugins/kapt3/kapt3-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
similarity index 100%
rename from plugins/kapt3/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
rename to plugins/kapt3/kapt3-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
diff --git a/plugins/kapt3/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/plugins/kapt3/kapt3-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
similarity index 100%
rename from plugins/kapt3/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
rename to plugins/kapt3/kapt3-compiler/src/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3BuilderFactory.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3BuilderFactory.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3BuilderFactory.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3BuilderFactory.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/KaptContext.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/KaptContext.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/KaptContext.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/KaptContext.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/annotationProcessing.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/annotationProcessing.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/annotationProcessing.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/annotationProcessing.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaCompiler.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaCompiler.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaCompiler.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaCompiler.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaFileObject.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaFileObject.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaFileObject.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaFileObject.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptJavaLog.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/javac/KaptTreeMaker.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/AnonymousTypeHandler.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/AnonymousTypeHandler.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/AnonymousTypeHandler.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/AnonymousTypeHandler.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/SignatureParserVisitor.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/SignatureParserVisitor.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/SignatureParserVisitor.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/SignatureParserVisitor.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/errorTypeConversion.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/errorTypeConversion.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/errorTypeConversion.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/errorTypeConversion.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/KaptLogger.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/KaptLogger.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/KaptLogger.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/KaptLogger.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/MessageCollectorBackedWriter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/MessageCollectorBackedWriter.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/MessageCollectorBackedWriter.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/MessageCollectorBackedWriter.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/asmUtils.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/java9Utils.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/java9Utils.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/java9Utils.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/java9Utils.kt
diff --git a/plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/javacListUtils.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/javacListUtils.kt
similarity index 100%
rename from plugins/kapt3/src/org/jetbrains/kotlin/kapt3/util/javacListUtils.kt
rename to plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/util/javacListUtils.kt
diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt
similarity index 98%
rename from plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt
rename to plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt
index aea49874a30..27875248a6e 100644
--- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt
+++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt
@@ -50,7 +50,7 @@ import com.sun.tools.javac.util.List as JavacList
 
 abstract class AbstractKotlinKapt3IntegrationTest : CodegenTestCase() {
     private companion object {
-        val TEST_DATA_DIR = File("plugins/kapt3/testData/kotlinRunner")
+        val TEST_DATA_DIR = File("plugins/kapt3/kapt3-compiler/testData/kotlinRunner")
     }
 
     private var _processors: List<Processor>? = null
diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
similarity index 100%
rename from plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
rename to plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/ClassFileToSourceStubConverterTestGenerated.java b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/ClassFileToSourceStubConverterTestGenerated.java
similarity index 75%
rename from plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/ClassFileToSourceStubConverterTestGenerated.java
rename to plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/ClassFileToSourceStubConverterTestGenerated.java
index 8ea449095e0..2b38e2ae615 100644
--- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/ClassFileToSourceStubConverterTestGenerated.java
+++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/ClassFileToSourceStubConverterTestGenerated.java
@@ -28,293 +28,293 @@ 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/kapt3/testData/converter")
+@TestMetadata("plugins/kapt3/kapt3-compiler/testData/converter")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ClassFileToSourceStubConverterTestGenerated extends AbstractClassFileToSourceStubConverterTest {
     @TestMetadata("abstractEnum.kt")
     public void testAbstractEnum() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/abstractEnum.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.kt");
         doTest(fileName);
     }
 
     @TestMetadata("abstractMethods.kt")
     public void testAbstractMethods() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/abstractMethods.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.kt");
         doTest(fileName);
     }
 
     public void testAllFilesPresentInConverter() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/kapt3/testData/converter"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/kapt3/kapt3-compiler/testData/converter"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("annotations.kt")
     public void testAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/annotations.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/annotations.kt");
         doTest(fileName);
     }
 
     @TestMetadata("annotations2.kt")
     public void testAnnotations2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/annotations2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/annotations2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("dataClass.kt")
     public void testDataClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/dataClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/dataClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("defaultImpls.kt")
     public void testDefaultImpls() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/defaultImpls.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.kt");
         doTest(fileName);
     }
 
     @TestMetadata("enums.kt")
     public void testEnums() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/enums.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/enums.kt");
         doTest(fileName);
     }
 
     @TestMetadata("fileFacadeJvmName.kt")
     public void testFileFacadeJvmName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/fileFacadeJvmName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("functions.kt")
     public void testFunctions() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/functions.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/functions.kt");
         doTest(fileName);
     }
 
     @TestMetadata("genericRawSignatures.kt")
     public void testGenericRawSignatures() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/genericRawSignatures.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.kt");
         doTest(fileName);
     }
 
     @TestMetadata("genericSimple.kt")
     public void testGenericSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/genericSimple.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.kt");
         doTest(fileName);
     }
 
     @TestMetadata("importsForErrorTypes.kt")
     public void testImportsForErrorTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/importsForErrorTypes.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.kt");
         doTest(fileName);
     }
 
     @TestMetadata("inheritanceSimple.kt")
     public void testInheritanceSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/inheritanceSimple.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.kt");
         doTest(fileName);
     }
 
     @TestMetadata("innerClassesWithTypeParameters.kt")
     public void testInnerClassesWithTypeParameters() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/innerClassesWithTypeParameters.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.kt");
         doTest(fileName);
     }
 
     @TestMetadata("invalidFieldName.kt")
     public void testInvalidFieldName() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/invalidFieldName.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt");
         doTest(fileName);
     }
 
     @TestMetadata("javaKeywords.kt")
     public void testJavaKeywords() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/javaKeywords.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.kt");
         doTest(fileName);
     }
 
     @TestMetadata("javaKeywordsInPackageNames.kt")
     public void testJavaKeywordsInPackageNames() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/javaKeywordsInPackageNames.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.kt");
         doTest(fileName);
     }
 
     @TestMetadata("jvmOverloads.kt")
     public void testJvmOverloads() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/jvmOverloads.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.kt");
         doTest(fileName);
     }
 
     @TestMetadata("jvmStatic.kt")
     public void testJvmStatic() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/jvmStatic.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt");
         doTest(fileName);
     }
 
     @TestMetadata("jvmStaticFieldInParent.kt")
     public void testJvmStaticFieldInParent() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/jvmStaticFieldInParent.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt14996.kt")
     public void testKt14996() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt14996.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt14996.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt14997.kt")
     public void testKt14997() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt14997.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt14997.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt14998.kt")
     public void testKt14998() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt14998.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt14998.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt15145.kt")
     public void testKt15145() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt15145.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt15145.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt17567.kt")
     public void testKt17567() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt17567.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt17567.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt18377.kt")
     public void testKt18377() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt18377.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt18377.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt18682.kt")
     public void testKt18682() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt18682.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt18682.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt18791.kt")
     public void testKt18791() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt18791.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt18791.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt19700.kt")
     public void testKt19700() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt19700.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt19700.kt");
         doTest(fileName);
     }
 
     @TestMetadata("kt19750.kt")
     public void testKt19750() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/kt19750.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/kt19750.kt");
         doTest(fileName);
     }
 
     @TestMetadata("mapEntry.kt")
     public void testMapEntry() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/mapEntry.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.kt");
         doTest(fileName);
     }
 
     @TestMetadata("methodParameterNames.kt")
     public void testMethodParameterNames() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/methodParameterNames.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.kt");
         doTest(fileName);
     }
 
     @TestMetadata("methodPropertySignatureClash.kt")
     public void testMethodPropertySignatureClash() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/methodPropertySignatureClash.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.kt");
         doTest(fileName);
     }
 
     @TestMetadata("modifiers.kt")
     public void testModifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/modifiers.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/modifiers.kt");
         doTest(fileName);
     }
 
     @TestMetadata("multifileClass.kt")
     public void testMultifileClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/multifileClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("nestedClasses.kt")
     public void testNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/nestedClasses.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.kt");
         doTest(fileName);
     }
 
     @TestMetadata("nestedClasses2.kt")
     public void testNestedClasses2() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/nestedClasses2.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt");
         doTest(fileName);
     }
 
     @TestMetadata("nestedClassesNonRootPackage.kt")
     public void testNestedClassesNonRootPackage() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/nestedClassesNonRootPackage.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt");
         doTest(fileName);
     }
 
     @TestMetadata("nonExistentClass.kt")
     public void testNonExistentClass() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/nonExistentClass.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.kt");
         doTest(fileName);
     }
 
     @TestMetadata("nonExistentClassTypesConversion.kt")
     public void testNonExistentClassTypesConversion() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/nonExistentClassTypesConversion.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.kt");
         doTest(fileName);
     }
 
     @TestMetadata("nonExistentClassWIthoutCorrection.kt")
     public void testNonExistentClassWIthoutCorrection() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/nonExistentClassWIthoutCorrection.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.kt");
         doTest(fileName);
     }
 
     @TestMetadata("primitiveTypes.kt")
     public void testPrimitiveTypes() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/primitiveTypes.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.kt");
         doTest(fileName);
     }
 
     @TestMetadata("propertyAnnotations.kt")
     public void testPropertyAnnotations() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/propertyAnnotations.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.kt");
         doTest(fileName);
     }
 
     @TestMetadata("severalPackageParts.kt")
     public void testSeveralPackageParts() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/severalPackageParts.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.kt");
         doTest(fileName);
     }
 
     @TestMetadata("strangeIdentifiers.kt")
     public void testStrangeIdentifiers() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/strangeIdentifiers.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.kt");
         doTest(fileName);
     }
 
     @TestMetadata("strangeNames.kt")
     public void testStrangeNames() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/strangeNames.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.kt");
         doTest(fileName);
     }
 
     @TestMetadata("topLevel.kt")
     public void testTopLevel() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/converter/topLevel.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt");
         doTest(fileName);
     }
 }
diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/JavaKaptContextTest.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/JavaKaptContextTest.kt
similarity index 98%
rename from plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/JavaKaptContextTest.kt
rename to plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/JavaKaptContextTest.kt
index 806b282f06c..36358f0d49d 100644
--- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/JavaKaptContextTest.kt
+++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/JavaKaptContextTest.kt
@@ -51,7 +51,7 @@ import javax.lang.model.element.TypeElement
 
 class JavaKaptContextTest {
     companion object {
-        private val TEST_DATA_DIR = File("plugins/kapt3/testData/runner")
+        private val TEST_DATA_DIR = File("plugins/kapt3/kapt3-compiler/testData/runner")
         val messageCollector = PrintingMessageCollector(System.err, MessageRenderer.PLAIN_FULL_PATHS, false)
 
         fun simpleProcessor() = object : AbstractProcessor() {
diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt
similarity index 100%
rename from plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt
rename to plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKapt3IntegrationTests.kt
diff --git a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/KotlinKaptContextTestGenerated.java b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKaptContextTestGenerated.java
similarity index 83%
rename from plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/KotlinKaptContextTestGenerated.java
rename to plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKaptContextTestGenerated.java
index e772472763f..881a6a5b3fe 100644
--- a/plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/KotlinKaptContextTestGenerated.java
+++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/KotlinKaptContextTestGenerated.java
@@ -28,29 +28,29 @@ 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/kapt3/testData/kotlinRunner")
+@TestMetadata("plugins/kapt3/kapt3-compiler/testData/kotlinRunner")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinKaptContextTestGenerated extends AbstractKotlinKaptContextTest {
     public void testAllFilesPresentInKotlinRunner() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/kapt3/testData/kotlinRunner"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/kapt3/kapt3-compiler/testData/kotlinRunner"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
     }
 
     @TestMetadata("NestedClasses.kt")
     public void testNestedClasses() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/kotlinRunner/NestedClasses.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Overloads.kt")
     public void testOverloads() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/kotlinRunner/Overloads.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.kt");
         doTest(fileName);
     }
 
     @TestMetadata("Simple.kt")
     public void testSimple() throws Exception {
-        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/testData/kotlinRunner/Simple.kt");
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.kt");
         doTest(fileName);
     }
 }
diff --git a/plugins/kapt3/testData/converter/abstractEnum.kt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/abstractEnum.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.kt
diff --git a/plugins/kapt3/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/abstractEnum.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt
diff --git a/plugins/kapt3/testData/converter/abstractMethods.kt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/abstractMethods.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.kt
diff --git a/plugins/kapt3/testData/converter/abstractMethods.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/abstractMethods.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/abstractMethods.txt
diff --git a/plugins/kapt3/testData/converter/annotations.kt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/annotations.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/annotations.kt
diff --git a/plugins/kapt3/testData/converter/annotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/annotations.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt
diff --git a/plugins/kapt3/testData/converter/annotations2.kt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/annotations2.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/annotations2.kt
diff --git a/plugins/kapt3/testData/converter/annotations2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/annotations2.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
diff --git a/plugins/kapt3/testData/converter/dataClass.kt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/dataClass.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/dataClass.kt
diff --git a/plugins/kapt3/testData/converter/dataClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/dataClass.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt
diff --git a/plugins/kapt3/testData/converter/defaultImpls.kt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/defaultImpls.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.kt
diff --git a/plugins/kapt3/testData/converter/defaultImpls.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/defaultImpls.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/defaultImpls.txt
diff --git a/plugins/kapt3/testData/converter/enums.kt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/enums.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/enums.kt
diff --git a/plugins/kapt3/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/enums.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/enums.txt
diff --git a/plugins/kapt3/testData/converter/fileFacadeJvmName.kt b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/fileFacadeJvmName.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.kt
diff --git a/plugins/kapt3/testData/converter/fileFacadeJvmName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/fileFacadeJvmName.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/fileFacadeJvmName.txt
diff --git a/plugins/kapt3/testData/converter/functions.kt b/plugins/kapt3/kapt3-compiler/testData/converter/functions.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/functions.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/functions.kt
diff --git a/plugins/kapt3/testData/converter/functions.txt b/plugins/kapt3/kapt3-compiler/testData/converter/functions.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/functions.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/functions.txt
diff --git a/plugins/kapt3/testData/converter/genericRawSignatures.kt b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/genericRawSignatures.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.kt
diff --git a/plugins/kapt3/testData/converter/genericRawSignatures.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/genericRawSignatures.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/genericRawSignatures.txt
diff --git a/plugins/kapt3/testData/converter/genericSimple.kt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/genericSimple.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.kt
diff --git a/plugins/kapt3/testData/converter/genericSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/genericSimple.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt
diff --git a/plugins/kapt3/testData/converter/importsForErrorTypes.kt b/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/importsForErrorTypes.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.kt
diff --git a/plugins/kapt3/testData/converter/importsForErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/importsForErrorTypes.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/importsForErrorTypes.txt
diff --git a/plugins/kapt3/testData/converter/inheritanceSimple.kt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/inheritanceSimple.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.kt
diff --git a/plugins/kapt3/testData/converter/inheritanceSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/inheritanceSimple.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/inheritanceSimple.txt
diff --git a/plugins/kapt3/testData/converter/innerClassesWithTypeParameters.kt b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/innerClassesWithTypeParameters.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.kt
diff --git a/plugins/kapt3/testData/converter/innerClassesWithTypeParameters.txt b/plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/innerClassesWithTypeParameters.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/innerClassesWithTypeParameters.txt
diff --git a/plugins/kapt3/testData/converter/invalidFieldName.kt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/invalidFieldName.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt
diff --git a/plugins/kapt3/testData/converter/invalidFieldName.txt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/invalidFieldName.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.txt
diff --git a/plugins/kapt3/testData/converter/javaKeywords.kt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/javaKeywords.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.kt
diff --git a/plugins/kapt3/testData/converter/javaKeywords.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/javaKeywords.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/javaKeywords.txt
diff --git a/plugins/kapt3/testData/converter/javaKeywordsInPackageNames.kt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/javaKeywordsInPackageNames.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.kt
diff --git a/plugins/kapt3/testData/converter/javaKeywordsInPackageNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/javaKeywordsInPackageNames.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/javaKeywordsInPackageNames.txt
diff --git a/plugins/kapt3/testData/converter/jvmOverloads.kt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/jvmOverloads.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.kt
diff --git a/plugins/kapt3/testData/converter/jvmOverloads.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/jvmOverloads.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt
diff --git a/plugins/kapt3/testData/converter/jvmStatic.kt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/jvmStatic.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.kt
diff --git a/plugins/kapt3/testData/converter/jvmStatic.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/jvmStatic.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmStatic.txt
diff --git a/plugins/kapt3/testData/converter/jvmStaticFieldInParent.kt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/jvmStaticFieldInParent.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.kt
diff --git a/plugins/kapt3/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/jvmStaticFieldInParent.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt
diff --git a/plugins/kapt3/testData/converter/kt14996.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt14996.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt14996.kt
diff --git a/plugins/kapt3/testData/converter/kt14996.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt14996.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt14996.txt
diff --git a/plugins/kapt3/testData/converter/kt14997.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt14997.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt14997.kt
diff --git a/plugins/kapt3/testData/converter/kt14997.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt14997.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt14997.txt
diff --git a/plugins/kapt3/testData/converter/kt14998.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt14998.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt14998.kt
diff --git a/plugins/kapt3/testData/converter/kt14998.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt14998.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt
diff --git a/plugins/kapt3/testData/converter/kt15145.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt15145.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt15145.kt
diff --git a/plugins/kapt3/testData/converter/kt15145.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt15145.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt15145.txt
diff --git a/plugins/kapt3/testData/converter/kt17567.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt17567.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt17567.kt
diff --git a/plugins/kapt3/testData/converter/kt17567.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt17567.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt17567.txt
diff --git a/plugins/kapt3/testData/converter/kt18377.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt18377.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt18377.kt
diff --git a/plugins/kapt3/testData/converter/kt18377.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt18377.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt18377.txt
diff --git a/plugins/kapt3/testData/converter/kt18682.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt18682.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt18682.kt
diff --git a/plugins/kapt3/testData/converter/kt18682.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt18682.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt18682.txt
diff --git a/plugins/kapt3/testData/converter/kt18791.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt18791.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt18791.kt
diff --git a/plugins/kapt3/testData/converter/kt18791.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt18791.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt
diff --git a/plugins/kapt3/testData/converter/kt19700.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt19700.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt19700.kt
diff --git a/plugins/kapt3/testData/converter/kt19700.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt19700.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt19700.txt
diff --git a/plugins/kapt3/testData/converter/kt19750.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt19750.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt19750.kt
diff --git a/plugins/kapt3/testData/converter/kt19750.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/kt19750.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/kt19750.txt
diff --git a/plugins/kapt3/testData/converter/mapEntry.kt b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/mapEntry.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.kt
diff --git a/plugins/kapt3/testData/converter/mapEntry.txt b/plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/mapEntry.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/mapEntry.txt
diff --git a/plugins/kapt3/testData/converter/methodParameterNames.kt b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/methodParameterNames.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.kt
diff --git a/plugins/kapt3/testData/converter/methodParameterNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/methodParameterNames.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/methodParameterNames.txt
diff --git a/plugins/kapt3/testData/converter/methodPropertySignatureClash.kt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/methodPropertySignatureClash.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.kt
diff --git a/plugins/kapt3/testData/converter/methodPropertySignatureClash.txt b/plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/methodPropertySignatureClash.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/methodPropertySignatureClash.txt
diff --git a/plugins/kapt3/testData/converter/modifiers.kt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/modifiers.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/modifiers.kt
diff --git a/plugins/kapt3/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/modifiers.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt
diff --git a/plugins/kapt3/testData/converter/multifileClass.kt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/multifileClass.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.kt
diff --git a/plugins/kapt3/testData/converter/multifileClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/multifileClass.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/multifileClass.txt
diff --git a/plugins/kapt3/testData/converter/nestedClasses.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/nestedClasses.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.kt
diff --git a/plugins/kapt3/testData/converter/nestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/nestedClasses.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt
diff --git a/plugins/kapt3/testData/converter/nestedClasses2.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/nestedClasses2.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt
diff --git a/plugins/kapt3/testData/converter/nestedClasses2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/nestedClasses2.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt
diff --git a/plugins/kapt3/testData/converter/nestedClassesNonRootPackage.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/nestedClassesNonRootPackage.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt
diff --git a/plugins/kapt3/testData/converter/nestedClassesNonRootPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/nestedClassesNonRootPackage.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt
diff --git a/plugins/kapt3/testData/converter/nonExistentClass.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/nonExistentClass.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.kt
diff --git a/plugins/kapt3/testData/converter/nonExistentClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/nonExistentClass.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt
diff --git a/plugins/kapt3/testData/converter/nonExistentClassTypesConversion.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/nonExistentClassTypesConversion.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.kt
diff --git a/plugins/kapt3/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/nonExistentClassTypesConversion.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
diff --git a/plugins/kapt3/testData/converter/nonExistentClassWIthoutCorrection.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/nonExistentClassWIthoutCorrection.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.kt
diff --git a/plugins/kapt3/testData/converter/nonExistentClassWIthoutCorrection.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/nonExistentClassWIthoutCorrection.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt
diff --git a/plugins/kapt3/testData/converter/primitiveTypes.kt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/primitiveTypes.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.kt
diff --git a/plugins/kapt3/testData/converter/primitiveTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/primitiveTypes.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.txt
diff --git a/plugins/kapt3/testData/converter/propertyAnnotations.kt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/propertyAnnotations.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.kt
diff --git a/plugins/kapt3/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/propertyAnnotations.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt
diff --git a/plugins/kapt3/testData/converter/severalPackageParts.kt b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/severalPackageParts.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.kt
diff --git a/plugins/kapt3/testData/converter/severalPackageParts.txt b/plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/severalPackageParts.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/severalPackageParts.txt
diff --git a/plugins/kapt3/testData/converter/strangeIdentifiers.kt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/strangeIdentifiers.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.kt
diff --git a/plugins/kapt3/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/strangeIdentifiers.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt
diff --git a/plugins/kapt3/testData/converter/strangeNames.kt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/strangeNames.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.kt
diff --git a/plugins/kapt3/testData/converter/strangeNames.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/strangeNames.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/strangeNames.txt
diff --git a/plugins/kapt3/testData/converter/topLevel.kt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt
similarity index 100%
rename from plugins/kapt3/testData/converter/topLevel.kt
rename to plugins/kapt3/kapt3-compiler/testData/converter/topLevel.kt
diff --git a/plugins/kapt3/testData/converter/topLevel.txt b/plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt
similarity index 100%
rename from plugins/kapt3/testData/converter/topLevel.txt
rename to plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt
diff --git a/plugins/kapt3/testData/kotlinRunner/NestedClasses.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/NestedClasses.it.txt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it.txt
diff --git a/plugins/kapt3/testData/kotlinRunner/NestedClasses.kt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.kt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/NestedClasses.kt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.kt
diff --git a/plugins/kapt3/testData/kotlinRunner/NestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.txt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/NestedClasses.txt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.txt
diff --git a/plugins/kapt3/testData/kotlinRunner/Overloads.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/Overloads.it.txt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.it.txt
diff --git a/plugins/kapt3/testData/kotlinRunner/Overloads.kt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.kt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/Overloads.kt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.kt
diff --git a/plugins/kapt3/testData/kotlinRunner/Overloads.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.txt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/Overloads.txt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Overloads.txt
diff --git a/plugins/kapt3/testData/kotlinRunner/Simple.it.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/Simple.it.txt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.it.txt
diff --git a/plugins/kapt3/testData/kotlinRunner/Simple.kt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.kt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/Simple.kt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.kt
diff --git a/plugins/kapt3/testData/kotlinRunner/Simple.txt b/plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.txt
similarity index 100%
rename from plugins/kapt3/testData/kotlinRunner/Simple.txt
rename to plugins/kapt3/kapt3-compiler/testData/kotlinRunner/Simple.txt
diff --git a/plugins/kapt3/testData/runner/ParseError.java b/plugins/kapt3/kapt3-compiler/testData/runner/ParseError.java
similarity index 100%
rename from plugins/kapt3/testData/runner/ParseError.java
rename to plugins/kapt3/kapt3-compiler/testData/runner/ParseError.java
diff --git a/plugins/kapt3/testData/runner/Simple.java b/plugins/kapt3/kapt3-compiler/testData/runner/Simple.java
similarity index 100%
rename from plugins/kapt3/testData/runner/Simple.java
rename to plugins/kapt3/kapt3-compiler/testData/runner/Simple.java
diff --git a/plugins/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts
similarity index 100%
rename from plugins/kapt3-idea/build.gradle.kts
rename to plugins/kapt3/kapt3-idea/build.gradle.kts
diff --git a/plugins/kapt3-idea/src/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService b/plugins/kapt3/kapt3-idea/src/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
similarity index 100%
rename from plugins/kapt3-idea/src/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
rename to plugins/kapt3/kapt3-idea/src/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
diff --git a/plugins/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt
similarity index 100%
rename from plugins/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt
rename to plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt
diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts
new file mode 100644
index 00000000000..c18293d6c9b
--- /dev/null
+++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts
@@ -0,0 +1,18 @@
+description = "Kotlin Annotation Processing Runtime"
+
+apply { plugin("kotlin") }
+
+jvmTarget = "1.6"
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" {}
+}
+
+runtimeJar()
+sourcesJar()
+javadocJar()
+
+dist(targetName = "kotlin-annotation-processing-runtime.jar")
+
+publish()
diff --git a/plugins/kapt3/kapt3-runtime/src/KaptIgnored.kt b/plugins/kapt3/kapt3-runtime/src/KaptIgnored.kt
new file mode 100644
index 00000000000..57c287b5dd6
--- /dev/null
+++ b/plugins/kapt3/kapt3-runtime/src/KaptIgnored.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2017 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.
+ */
+
+package kotlinx.kapt
+
+/**
+ * Declaration annotated with [KaptIgnored] would not be included in stubs passed to annotation processors.
+ */
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.FIELD)
+@Retention(AnnotationRetention.SOURCE)
+public annotation class KaptIgnored
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 48d276cfd95..780e978f2ab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -135,6 +135,7 @@ include ":kotlin-build-common",
         ":examples:annotation-processor-example",
         ":kotlin-script-util",
         ":kotlin-annotation-processing",
+        ":kotlin-annotation-processing-runtime",
         ":kotlin-annotation-processing-gradle",
         ":kotlin-annotation-processing-embeddable",
         ":examples:kotlin-jsr223-local-example",
@@ -215,7 +216,9 @@ project(':examples:annotation-processor-example').projectDir = "$rootDir/librari
 project(':kotlin-script-util').projectDir = "$rootDir/libraries/tools/kotlin-script-util" as File
 project(':kotlin-annotation-processing-gradle').projectDir = "$rootDir/libraries/tools/kotlin-annotation-processing" as File
 project(':kotlin-annotation-processing-embeddable').projectDir = "$rootDir/prepare/kotlin-annotation-processing-embeddable" as File
-project(':kotlin-annotation-processing').projectDir = "$rootDir/plugins/kapt3" as File
+project(':kotlin-annotation-processing').projectDir = "$rootDir/plugins/kapt3/kapt3-compiler" as File
+project(':kotlin-annotation-processing-runtime').projectDir = "$rootDir/plugins/kapt3/kapt3-runtime" as File
+project(':plugins:kapt3-idea').projectDir = "$rootDir/plugins/kapt3/kapt3-idea" as File
 project(':examples:kotlin-jsr223-local-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-local-example" as File
 project(':examples:kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-daemon-local-eval-example" as File
 project(':kotlin-annotations-jvm').projectDir = "$rootDir/libraries/tools/kotlin-annotations-jvm" as File