diff --git a/maven-compiler-plugin-with-toolchain-support/pom.xml b/maven-compiler-plugin/pom.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/pom.xml
rename to maven-compiler-plugin/pom.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/it/pom.xml b/maven-compiler-plugin/src/it/pom.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/it/pom.xml
rename to maven-compiler-plugin/src/it/pom.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/it/test1/pom.xml b/maven-compiler-plugin/src/it/test1/pom.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/it/test1/pom.xml
rename to maven-compiler-plugin/src/it/test1/pom.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/it/test1/src/main/java/MyClass.java b/maven-compiler-plugin/src/it/test1/src/main/java/MyClass.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/it/test1/src/main/java/MyClass.java
rename to maven-compiler-plugin/src/it/test1/src/main/java/MyClass.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java b/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
rename to maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/CompilationFailureException.java b/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/CompilationFailureException.java
rename to maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/CompilerMojo.java b/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/CompilerMojo.java
rename to maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java b/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
rename to maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/compile-using-different-jdk.apt b/maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/compile-using-different-jdk.apt
rename to maven-compiler-plugin/src/site/apt/examples/compile-using-different-jdk.apt
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/compile-with-memory-enhancements.apt b/maven-compiler-plugin/src/site/apt/examples/compile-with-memory-enhancements.apt
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/compile-with-memory-enhancements.apt
rename to maven-compiler-plugin/src/site/apt/examples/compile-with-memory-enhancements.apt
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/pass-compiler-arguments.apt b/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/pass-compiler-arguments.apt
rename to maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/set-compiler-source-and-target.apt b/maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/apt/examples/set-compiler-source-and-target.apt
rename to maven-compiler-plugin/src/site/apt/examples/set-compiler-source-and-target.apt
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/apt/index.apt b/maven-compiler-plugin/src/site/apt/index.apt
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/apt/index.apt
rename to maven-compiler-plugin/src/site/apt/index.apt
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/apt/non-javac-compilers.apt b/maven-compiler-plugin/src/site/apt/non-javac-compilers.apt
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/apt/non-javac-compilers.apt
rename to maven-compiler-plugin/src/site/apt/non-javac-compilers.apt
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/apt/usage.apt b/maven-compiler-plugin/src/site/apt/usage.apt
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/apt/usage.apt
rename to maven-compiler-plugin/src/site/apt/usage.apt
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/fml/faq.fml b/maven-compiler-plugin/src/site/fml/faq.fml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/fml/faq.fml
rename to maven-compiler-plugin/src/site/fml/faq.fml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/site/site.xml b/maven-compiler-plugin/src/site/site.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/site/site.xml
rename to maven-compiler-plugin/src/site/site.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java b/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
rename to maven-compiler-plugin/src/test/java/org/apache/maven/plugin/CompilerMojoTestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/stubs/CompilerManagerStub.java b/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/stubs/CompilerManagerStub.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/stubs/CompilerManagerStub.java
rename to maven-compiler-plugin/src/test/java/org/apache/maven/plugin/stubs/CompilerManagerStub.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java b/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java
rename to maven-compiler-plugin/src/test/java/org/apache/maven/plugin/stubs/CompilerStub.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/stubs/DebugEnabledLog.java b/maven-compiler-plugin/src/test/java/org/apache/maven/plugin/stubs/DebugEnabledLog.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/java/org/apache/maven/plugin/stubs/DebugEnabledLog.java
rename to maven-compiler-plugin/src/test/java/org/apache/maven/plugin/stubs/DebugEnabledLog.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-args-test/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-args-test/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-args-test/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-args-test/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java b/maven-compiler-plugin/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-args-test/src/main/java/TestCompile0.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java b/maven-compiler-plugin/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-args-test/src/test/java/TestCompile0Test.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-basic-test/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-basic-test/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-basic-test/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-basic-test/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java b/maven-compiler-plugin/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-basic-test/src/main/java/TestCompile0.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java b/maven-compiler-plugin/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-basic-test/src/test/java/TestCompile0Test.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-empty-source-test/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fail-test/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-fail-test/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fail-test/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-fail-test/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java b/maven-compiler-plugin/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-fail-test/src/main/java/TestCompile0.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java b/maven-compiler-plugin/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-fail-test/src/test/java/TestCompile0Test.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fork-test/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-fork-test/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fork-test/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-fork-test/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java b/maven-compiler-plugin/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-fork-test/src/main/java/TestCompile1.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-fork-test/src/test/java/TestCompile1TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java b/maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile2.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java b/maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile3.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java b/maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/main/java/TestCompile4.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile2TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile3TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-includes-excludes-test/src/test/java/TestCompile4TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile2.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile3.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/main/java/TestCompile4.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile2TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile3TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test/src/test/java/TestCompile4TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/plugin-config.xml
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile2.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile3.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/main/java/TestCompile4.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile2TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile3TestCase.java
diff --git a/maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java b/maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
similarity index 100%
rename from maven-compiler-plugin-with-toolchain-support/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java
rename to maven-compiler-plugin/src/test/resources/unit/compiler-one-output-file-test2/src/test/java/TestCompile4TestCase.java