From aef736434ee1f3012f7af099c211ffb8ecffb2f2 Mon Sep 17 00:00:00 2001
From: Matt Pavlovich <matt@hyte.io>
Date: Tue, 1 Aug 2023 08:56:52 -0500
Subject: [PATCH] [#264] Move maven-plugin project to submodule ahead of
 migrating jaxb-basics and other modules

---
 {dist => maven-plugin/dist}/.gitignore        |  0
 {dist => maven-plugin/dist}/pom.xml           |  0
 .../plugin-core}/.gitignore                   |  0
 .../plugin-core}/pom.xml                      |  2 +-
 .../jvnet/jaxb/maven/AbstractXJC2Mojo.java    |  0
 .../jvnet/jaxb/maven/DependencyResource.java  |  0
 .../maven/DependencyResourceResolver.java     |  0
 .../org/jvnet/jaxb/maven/IOptionsFactory.java |  0
 .../jaxb/maven/OptionsConfiguration.java      |  0
 .../jaxb/maven/ParentFirstClassLoader.java    |  0
 .../org/jvnet/jaxb/maven/RawXJC2Mojo.java     |  0
 .../org/jvnet/jaxb/maven/ResourceEntry.java   |  0
 .../AbstractHTTPURILastModifiedResolver.java  |  0
 ...actSchemeAwareURILastModifiedResolver.java |  0
 .../net/CompositeURILastModifiedResolver.java |  0
 .../net/FileURILastModifiedResolver.java      |  0
 .../net/HttpURILastModifiedResolver.java      |  0
 .../net/HttpsURILastModifiedResolver.java     |  0
 .../maven/net/JarURILastModifiedResolver.java |  0
 .../SchemeAwareURILastModifiedResolver.java   |  0
 .../maven/net/URILastModifiedResolver.java    |  0
 .../jaxb/maven/plugin/logging/NullLog.java    |  0
 .../tools/ClasspathCatalogResolver.java       |  0
 .../resolver/tools/MavenCatalogResolver.java  |  0
 .../ReResolvingEntityResolverWrapper.java     |  0
 .../tools/ReResolvingInputSourceWrapper.java  |  0
 .../jvnet/jaxb/maven/util/ArtifactUtils.java  |  0
 .../jaxb/maven/util/CollectionUtils.java      |  0
 .../org/jvnet/jaxb/maven/util/IOUtils.java    |  0
 .../jvnet/jaxb/maven/util/LocaleUtils.java    |  0
 .../jvnet/jaxb/maven/util/StringUtils.java    |  0
 .../addIfExistsToEpisodeSchemaBindings.xslt   |  0
 .../org/jvnet/jaxb/maven/RawXJC2MojoTest.java |  0
 .../tests/URILastModifiedResolverTest.java    |  0
 .../tools/tests/MavenCatalogResolverTest.java |  0
 ...ddIfExistsToEpisodeSchemaBindingsTest.java |  0
 .../maven/tests/DependencyResourceTest.java   |  0
 .../util/tests/CollectionsUtilsTests.java     |  0
 .../maven/resolver/tools/tests/a/catalog.cat  |  0
 .../resolver/tools/tests/a/w3c/1999/xlink.xsd |  0
 .../maven/resolver/tools/tests/b/catalog.cat  |  0
 .../tests/b/w3c/2005/atom-author-link.xsd     |  0
 {plugin => maven-plugin/plugin}/.gitignore    |  0
 {plugin => maven-plugin/plugin}/pom.xml       |  4 +-
 .../jvnet/jaxb/maven/LoggingCodeWriter.java   |  0
 .../jaxb/maven/LoggingErrorReceiver.java      |  0
 .../org/jvnet/jaxb/maven/OptionsFactory.java  |  0
 .../java/org/jvnet/jaxb/maven/XJC2Mojo.java   |  0
 .../m2e/lifecycle-mapping-metadata.xml        |  0
 .../plugin}/src/site/site.xml                 |  0
 .../jvnet/jaxb/maven/JAXBGenerateTest.java    |  0
 .../jaxb/maven/JAXBGenerateTestSuite.java     |  0
 .../src/test/resources/purchaseorder.xsd      |  0
 .../plugin}/src/test/resources/test-pom.xml   |  0
 maven-plugin/pom.xml                          | 81 +++++++++++++++++++
 qrelease.bat => maven-plugin/qrelease.bat     |  0
 .../samples}/catalog/.gitignore               |  0
 .../samples}/catalog/pom.xml                  |  0
 .../samples}/catalog/project-pom.xml          |  0
 .../catalog/src/main/assembly/maven-src.xml   |  0
 .../catalog/src/main/resources/catalog.cat    |  0
 .../catalog/src/main/resources/schema_a.xsd   |  0
 .../catalog/src/main/resources/schema_b.xsd   |  0
 .../samples}/dtd/.gitignore                   |  0
 {samples => maven-plugin/samples}/dtd/pom.xml |  0
 .../samples}/dtd/project-pom.xml              |  0
 .../dtd/src/main/assembly/maven-src.xml       |  0
 .../dtd/src/main/resources/binding.xjb        |  0
 .../src/main/resources/hibernate-mapping.dtd  |  0
 .../samples}/episode/.gitignore               |  0
 .../samples}/episode/a/project-pom.xml        |  0
 .../episode/a/src/main/resources/a.xsd        |  0
 .../samples}/episode/b/project-pom.xml        |  0
 .../episode/b/src/main/resources/b.xsd        |  0
 .../episode/b/src/main/resources/catalog.cat  |  0
 .../samples}/episode/c/project-pom.xml        |  0
 .../episode/c/src/main/resources/c.xsd        |  0
 .../samples}/episode/pom.xml                  |  0
 .../samples}/episode/project-pom.xml          |  0
 .../episode/src/main/assembly/maven-src.xml   |  0
 .../samples}/jaxbplugins/.gitignore           |  0
 .../samples}/jaxbplugins/pom.xml              |  0
 .../samples}/jaxbplugins/project-pom.xml      |  0
 .../src/main/assembly/maven-src.xml           |  0
 .../src/main/resources/purchaseorder.xsd      |  0
 .../samples}/po/.gitignore                    |  0
 {samples => maven-plugin/samples}/po/pom.xml  |  0
 .../samples}/po/project-pom.xml               |  0
 .../po/src/main/assembly/maven-src.xml        |  0
 .../po/src/main/resources/purchaseorder.xsd   |  0
 {samples => maven-plugin/samples}/pom.xml     |  0
 {src => maven-plugin/src}/site/site.xml       |  0
 {testing => maven-plugin/testing}/.gitignore  |  0
 {testing => maven-plugin/testing}/pom.xml     |  0
 .../jvnet/jaxb/maven/test/RunXJC2Mojo.java    |  0
 .../jaxb/maven/test/plugin/foo/FooPlugin.java |  0
 .../services/com.sun.tools.xjc.Plugin         |  0
 .../testing}/src/site/site.xml                |  0
 .../test/plugin/foo/tests/RunFooPlugin.java   |  0
 .../src/test/resources/log4j.properties       |  0
 .../src/test/resources/purchaseorder.xsd      |  0
 .../tests}/JAXB-1044/.gitignore               |  0
 .../tests}/JAXB-1044/pom.xml                  |  0
 .../tests}/JAXB-1044/src/main/resources/a.xjb |  0
 .../tests}/JAXB-1044/src/main/resources/a.xsd |  0
 .../tests}/JAXB-1044/src/main/resources/b.xsd |  0
 .../JAXB-1044/src/main/resources/catalog.cat  |  0
 .../tests/JAXB_1044/RunJAXB_1044Mojo.java     |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-49/.gitignore   |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-49/pom.xml      |  0
 .../src/main/resources/catalog.cat            |  0
 .../schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-53/a/.gitignore |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-53/a/pom.xml    |  0
 .../a/src/main/resources/a.xsd                |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-53/b/.gitignore |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-53/b/pom.xml    |  0
 .../b/src/main/resources/b.xsd                |  0
 .../b/src/main/resources/catalog.cat          |  0
 .../b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java       |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-53/pom.xml      |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-69/.gitignore   |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-69/pom.xml      |  0
 .../src/main/resources/simple.xsd             |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-70/.gitignore   |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-70/pom.xml      |  0
 .../src/main/resources/bindings.xjb           |  0
 .../common-types/.gitignore                   |  0
 .../common-types/pom.xml                      |  0
 .../META-INF/project/schemas/CommonTypes.xsd  |  0
 .../schemas/ISOCurrencyCodeType-V2008.xsd     |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-77/pom.xml      |  0
 .../MAVEN_JAXB2_PLUGIN-77/service/.gitignore  |  0
 .../MAVEN_JAXB2_PLUGIN-77/service/pom.xml     |  0
 .../service/src/main/jaxb/catalog.cat         |  0
 .../META-INF/project/schemas/Service.xsd      |  0
 .../RunMAVEN_JAXB2_PLUGIN_77Mojo.java         |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-79/a/.gitignore |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-79/a/pom.xml    |  0
 .../a/src/main/resources/a.xjb                |  0
 .../a/src/main/resources/a.xsd                |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-79/b/.gitignore |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-79/b/pom.xml    |  0
 .../b/src/main/resources/b.xsd                |  0
 .../b/src/main/resources/catalog.cat          |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-79/pom.xml      |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-82/a/.gitignore |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-82/a/pom.xml    |  0
 .../a/src/main/resources/a.xsd                |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-82/b/.gitignore |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-82/b/pom.xml    |  0
 .../b/src/main/resources/b.xjb                |  0
 .../b/src/main/resources/b.xsd                |  0
 .../b/src/main/resources/catalog.cat          |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-82/pom.xml      |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-86/.gitignore   |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-86/pom.xml      |  0
 .../src/main/resources/a/a.xsd                |  0
 .../src/main/resources/b/b.xsd                |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-87/.gitignore   |  0
 .../tests}/MAVEN_JAXB2_PLUGIN-87/pom.xml      |  0
 .../src/main/resources/purchaseorder.xsd      |  0
 .../tests}/catalog-xml/.gitignore             |  0
 .../tests}/catalog-xml/pom.xml                |  0
 .../src/main/resources/catalog.xml            |  0
 .../src/main/resources/schema_a.xsd           |  0
 .../src/main/resources/schema_b.xsd           |  0
 .../maven/tests/catalog/RunCatalogMojo.java   |  0
 .../tests/catalog/RunPlainCatalogMojo.java    |  0
 .../tests}/catalog/.gitignore                 |  0
 {tests => maven-plugin/tests}/catalog/pom.xml |  0
 .../catalog/src/main/resources/catalog.cat    |  0
 .../catalog/src/main/resources/schema_a.xsd   |  0
 .../catalog/src/main/resources/schema_b.xsd   |  0
 .../maven/tests/catalog/RunCatalogMojo.java   |  0
 .../tests/catalog/RunPlainCatalogMojo.java    |  0
 .../tests}/episodes/a/.gitignore              |  0
 .../tests}/episodes/a/pom.xml                 |  0
 .../episodes/a/src/main/resources/a.xjb       |  0
 .../episodes/a/src/main/resources/a.xsd       |  0
 .../tests}/episodes/b/.gitignore              |  0
 .../tests}/episodes/b/pom.xml                 |  0
 .../episodes/b/src/main/resources/b.xsd       |  0
 .../episodes/b/src/main/resources/catalog.cat |  0
 .../tests}/episodes/c/.gitignore              |  0
 .../tests}/episodes/c/pom.xml                 |  0
 .../episodes/c/src/main/resources/c.xsd       |  0
 .../tests}/episodes/d/.gitignore              |  0
 .../tests}/episodes/d/pom.xml                 |  0
 .../episodes/d/src/main/resources/catalog.cat |  0
 .../episodes/d/src/main/resources/d.xsd       |  0
 .../tests}/episodes/e/.gitignore              |  0
 .../tests}/episodes/e/pom.xml                 |  0
 .../episodes/e/src/main/resources/catalog.cat |  0
 .../episodes/e/src/main/resources/d.xsd       |  0
 .../tests}/episodes/pom.xml                   |  0
 .../tests}/full-build-1.7.bat                 |  0
 .../tests}/full-build-1.8.bat                 |  0
 .../tests}/full-build-9.bat                   |  0
 .../tests}/gh-issue-16/.gitignore             |  0
 .../tests}/gh-issue-16/pom.xml                |  0
 .../gh-issue-16/src/main/resources/ab/a.xjb   |  0
 .../gh-issue-16/src/main/resources/ab/a.xsd   |  0
 .../gh-issue-16/src/main/resources/ab/b.xsd   |  0
 .../src/main/resources/ab/catalog.cat         |  0
 .../tests}/gh-issue-19/a/.gitignore           |  0
 .../tests}/gh-issue-19/a/pom.xml              |  0
 .../gh-issue-19/a/src/main/resources/a/a.xsd  |  0
 .../tests}/gh-issue-19/b/.gitignore           |  0
 .../tests}/gh-issue-19/b/pom.xml              |  0
 .../gh-issue-19/b/src/main/resources/b/b.cat  |  0
 .../gh-issue-19/b/src/main/resources/b/b.xsd  |  0
 .../tests}/gh-issue-19/pom.xml                |  0
 .../tests}/gh-issue-22/a/.gitignore           |  0
 .../tests}/gh-issue-22/a/pom.xml              |  0
 .../gh-issue-22/a/src/main/resources/a.xsd    |  0
 .../tests}/gh-issue-22/b/.gitignore           |  0
 .../tests}/gh-issue-22/b/pom.xml              |  0
 .../tests}/gh-issue-22/pom.xml                |  0
 .../gh-issue-23/one-non-strict/.gitignore     |  0
 .../tests}/gh-issue-23/one-non-strict/pom.xml |  0
 .../main/resources/META-INF/one/catalog.xml   |  0
 .../src/main/resources/one/a.xsd              |  0
 .../src/main/resources/one/b.xsd              |  0
 .../src/main/resources/one/b1.xsd             |  0
 .../src/main/resources/two/p.xsd              |  0
 .../tests}/gh-issue-23/pom.xml                |  0
 .../gh-issue-23/two-non-strict/.gitignore     |  0
 .../tests}/gh-issue-23/two-non-strict/pom.xml |  0
 .../main/resources/META-INF/two/catalog.xml   |  0
 .../src/main/resources/one/a.xsd              |  0
 .../src/main/resources/one/b.xsd              |  0
 .../src/main/resources/one/b1.xsd             |  0
 .../src/main/resources/two/p.xsd              |  0
 .../tests}/gh-issue-58/.gitignore             |  0
 .../tests}/gh-issue-58/pom.xml                |  0
 .../src/main/resources/purchaseorder.xsd      |  0
 .../tests}/issues/.gitignore                  |  0
 {tests => maven-plugin/tests}/issues/pom.xml  |  0
 .../maven/tests/issues/common/Generated.java  |  0
 .../issues/src/main/resources/binding.xjb     |  0
 .../issues/src/main/resources/depends.dep     |  0
 .../issues/src/main/resources/depends.txt     |  0
 .../issues/src/main/resources/schema.xsd      |  0
 .../src/test/resources/log4j.properties       |  0
 .../tests}/java-9/.gitignore                  |  0
 .../tests}/java-9/install-10.bat              |  0
 .../tests}/java-9/install-8.bat               |  0
 .../tests}/java-9/install-9.bat               |  0
 {tests => maven-plugin/tests}/java-9/pom.xml  |  0
 .../java-9/src/main/resources/SimpleClass.xsd |  0
 .../resources/SimpleClassWithOtherName.xsd    |  0
 .../main/resources/SimpleClassWithPackage.xsd |  0
 .../org/jvnet/jaxb/maven/java9/Java9Test.java |  0
 {tests => maven-plugin/tests}/p_o/.gitignore  |  0
 {tests => maven-plugin/tests}/p_o/pom.xml     |  0
 .../tests}/p_o/src/main/resources/binding.xjb |  0
 .../p_o/src/main/resources/purchaseorder.xsd  |  0
 .../jvnet/mjiip/tests/p_o/RunP_OPlugin.java   |  0
 .../org/jvnet/mjiip/tests/p_o/RunXJC.java     |  0
 .../tests}/po-2.3/.gitignore                  |  0
 {tests => maven-plugin/tests}/po-2.3/pom.xml  |  0
 .../src/main/resources/purchaseorder.xsd      |  0
 .../tests}/po-scd/.gitignore                  |  0
 .../tests}/po-scd/build-1.5.bat               |  0
 .../tests}/po-scd/build-1.6.bat               |  0
 {tests => maven-plugin/tests}/po-scd/pom.xml  |  0
 .../po-scd/src/main/resources/bindings.xjb    |  0
 .../src/main/resources/purchaseorder.xsd      |  0
 {tests => maven-plugin/tests}/pom.xml         |  0
 {tests => maven-plugin/tests}/res/.gitignore  |  0
 {tests => maven-plugin/tests}/res/pom.xml     |  0
 .../res/src/main/resources/bindings.xjb       |  0
 .../tests}/res/src/main/resources/catalog.cat |  0
 .../schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd |  0
 .../tests}/res/src/main/schemas/schema.xs     |  0
 .../tests}/res/src/main/schemas/schema.xsd    |  0
 .../jaxb/maven/tests/res/RunResMojo.java      |  0
 {tests => maven-plugin/tests}/rnc/.gitignore  |  0
 {tests => maven-plugin/tests}/rnc/pom.xml     |  0
 .../tests}/rnc/src/main/resources/georss.rnc  |  0
 .../tests/rnc/DatatypeLibraryLoaderTest.java  |  0
 .../jaxb/maven/tests/rnc/RunRNCMojo.java      |  0
 {tests => maven-plugin/tests}/tse/.gitignore  |  0
 {tests => maven-plugin/tests}/tse/pom.xml     |  0
 .../tests}/tse/src/main/java/a/A2Enum.java    |  0
 .../tse/src/main/java/a/ObjectFactory.java    |  0
 .../tests}/tse/src/main/resources/a.xsd       |  0
 .../tests}/tse/src/main/resources/b.xsd       |  0
 {tests => maven-plugin/tests}/two/.gitignore  |  0
 .../tests}/two/build-1.5.bat                  |  0
 .../tests}/two/build-1.6.bat                  |  0
 {tests => maven-plugin/tests}/two/pom.xml     |  0
 .../tests}/two/src/main/resources/schema.xs   |  0
 .../tests}/two/src/main/resources/schema.xsd  |  0
 .../two/src/test/resources/log4j.properties   |  0
 .../tests}/two/src/test/samples/1.xml         |  0
 .../tests}/wsdl-file/.gitignore               |  0
 .../tests}/wsdl-file/build-1.5.bat            |  0
 .../tests}/wsdl-file/build-1.6.bat            |  0
 .../tests}/wsdl-file/pom.xml                  |  0
 .../src/main/resources/pedidowebservice.wsdl  |  0
 .../net/webservicex/test/JAXBContextTest.java |  0
 {tests => maven-plugin/tests}/wsdl/.gitignore |  0
 .../tests}/wsdl/build-1.5.bat                 |  0
 .../tests}/wsdl/build-1.6.bat                 |  0
 {tests => maven-plugin/tests}/wsdl/pom.xml    |  0
 .../net/webservicex/test/JAXBContextTest.java |  0
 .../tests}/xjc-simple/.gitignore              |  0
 .../tests}/xjc-simple/pom.xml                 |  0
 .../src/main/resources/purchaseorder.xjb      |  0
 .../src/main/resources/purchaseorder.xsd      |  0
 .../www}/alm-process/snippets/page.xml        |  0
 {www => maven-plugin/www}/docs/guide.html     |  0
 {www => maven-plugin/www}/index.html          |  0
 {www => maven-plugin/www}/project_tools.html  |  0
 pom.xml                                       | 56 +++----------
 317 files changed, 93 insertions(+), 50 deletions(-)
 rename {dist => maven-plugin/dist}/.gitignore (100%)
 rename {dist => maven-plugin/dist}/pom.xml (100%)
 rename {plugin-core => maven-plugin/plugin-core}/.gitignore (100%)
 rename {plugin-core => maven-plugin/plugin-core}/pom.xml (97%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/main/resources/org/jvnet/jaxb/maven/addIfExistsToEpisodeSchemaBindings.xslt (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/catalog.cat (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/w3c/1999/xlink.xsd (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/catalog.cat (100%)
 rename {plugin-core => maven-plugin/plugin-core}/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd (100%)
 rename {plugin => maven-plugin/plugin}/.gitignore (100%)
 rename {plugin => maven-plugin/plugin}/pom.xml (96%)
 rename {plugin => maven-plugin/plugin}/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java (100%)
 rename {plugin => maven-plugin/plugin}/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java (100%)
 rename {plugin => maven-plugin/plugin}/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java (100%)
 rename {plugin => maven-plugin/plugin}/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java (100%)
 rename {plugin => maven-plugin/plugin}/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml (100%)
 rename {plugin => maven-plugin/plugin}/src/site/site.xml (100%)
 rename {plugin => maven-plugin/plugin}/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java (100%)
 rename {plugin => maven-plugin/plugin}/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java (100%)
 rename {plugin => maven-plugin/plugin}/src/test/resources/purchaseorder.xsd (100%)
 rename {plugin => maven-plugin/plugin}/src/test/resources/test-pom.xml (100%)
 create mode 100644 maven-plugin/pom.xml
 rename qrelease.bat => maven-plugin/qrelease.bat (100%)
 rename {samples => maven-plugin/samples}/catalog/.gitignore (100%)
 rename {samples => maven-plugin/samples}/catalog/pom.xml (100%)
 rename {samples => maven-plugin/samples}/catalog/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/catalog/src/main/assembly/maven-src.xml (100%)
 rename {samples => maven-plugin/samples}/catalog/src/main/resources/catalog.cat (100%)
 rename {samples => maven-plugin/samples}/catalog/src/main/resources/schema_a.xsd (100%)
 rename {samples => maven-plugin/samples}/catalog/src/main/resources/schema_b.xsd (100%)
 rename {samples => maven-plugin/samples}/dtd/.gitignore (100%)
 rename {samples => maven-plugin/samples}/dtd/pom.xml (100%)
 rename {samples => maven-plugin/samples}/dtd/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/dtd/src/main/assembly/maven-src.xml (100%)
 rename {samples => maven-plugin/samples}/dtd/src/main/resources/binding.xjb (100%)
 rename {samples => maven-plugin/samples}/dtd/src/main/resources/hibernate-mapping.dtd (100%)
 rename {samples => maven-plugin/samples}/episode/.gitignore (100%)
 rename {samples => maven-plugin/samples}/episode/a/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/episode/a/src/main/resources/a.xsd (100%)
 rename {samples => maven-plugin/samples}/episode/b/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/episode/b/src/main/resources/b.xsd (100%)
 rename {samples => maven-plugin/samples}/episode/b/src/main/resources/catalog.cat (100%)
 rename {samples => maven-plugin/samples}/episode/c/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/episode/c/src/main/resources/c.xsd (100%)
 rename {samples => maven-plugin/samples}/episode/pom.xml (100%)
 rename {samples => maven-plugin/samples}/episode/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/episode/src/main/assembly/maven-src.xml (100%)
 rename {samples => maven-plugin/samples}/jaxbplugins/.gitignore (100%)
 rename {samples => maven-plugin/samples}/jaxbplugins/pom.xml (100%)
 rename {samples => maven-plugin/samples}/jaxbplugins/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/jaxbplugins/src/main/assembly/maven-src.xml (100%)
 rename {samples => maven-plugin/samples}/jaxbplugins/src/main/resources/purchaseorder.xsd (100%)
 rename {samples => maven-plugin/samples}/po/.gitignore (100%)
 rename {samples => maven-plugin/samples}/po/pom.xml (100%)
 rename {samples => maven-plugin/samples}/po/project-pom.xml (100%)
 rename {samples => maven-plugin/samples}/po/src/main/assembly/maven-src.xml (100%)
 rename {samples => maven-plugin/samples}/po/src/main/resources/purchaseorder.xsd (100%)
 rename {samples => maven-plugin/samples}/pom.xml (100%)
 rename {src => maven-plugin/src}/site/site.xml (100%)
 rename {testing => maven-plugin/testing}/.gitignore (100%)
 rename {testing => maven-plugin/testing}/pom.xml (100%)
 rename {testing => maven-plugin/testing}/src/main/java/org/jvnet/jaxb/maven/test/RunXJC2Mojo.java (100%)
 rename {testing => maven-plugin/testing}/src/main/java/org/jvnet/jaxb/maven/test/plugin/foo/FooPlugin.java (100%)
 rename {testing => maven-plugin/testing}/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (100%)
 rename {testing => maven-plugin/testing}/src/site/site.xml (100%)
 rename {testing => maven-plugin/testing}/src/test/java/org/jvnet/jaxb/maven/test/plugin/foo/tests/RunFooPlugin.java (100%)
 rename {testing => maven-plugin/testing}/src/test/resources/log4j.properties (100%)
 rename {testing => maven-plugin/testing}/src/test/resources/purchaseorder.xsd (100%)
 rename {tests => maven-plugin/tests}/JAXB-1044/.gitignore (100%)
 rename {tests => maven-plugin/tests}/JAXB-1044/pom.xml (100%)
 rename {tests => maven-plugin/tests}/JAXB-1044/src/main/resources/a.xjb (100%)
 rename {tests => maven-plugin/tests}/JAXB-1044/src/main/resources/a.xsd (100%)
 rename {tests => maven-plugin/tests}/JAXB-1044/src/main/resources/b.xsd (100%)
 rename {tests => maven-plugin/tests}/JAXB-1044/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/JAXB-1044/src/test/java/org/jvnet/jaxb/maven/tests/JAXB_1044/RunJAXB_1044Mojo.java (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-49/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-49/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-49/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-49/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/a/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/a/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/a/src/main/resources/a.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/b/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/b/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/b.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-53/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-69/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-69/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-69/src/main/resources/simple.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-70/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-70/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-70/src/main/resources/bindings.xjb (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/CommonTypes.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/ISOCurrencyCodeType-V2008.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/service/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/service/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/service/src/main/jaxb/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/service/src/main/resources/META-INF/project/schemas/Service.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/a/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/a/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xjb (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/b/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/b/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/b.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-79/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/a/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/a/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/a/src/main/resources/a.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/b/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/b/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xjb (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-82/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-86/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-86/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-86/src/main/resources/a/a.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-86/src/main/resources/b/b.xsd (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-87/.gitignore (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-87/pom.xml (100%)
 rename {tests => maven-plugin/tests}/MAVEN_JAXB2_PLUGIN-87/src/main/resources/purchaseorder.xsd (100%)
 rename {tests => maven-plugin/tests}/catalog-xml/.gitignore (100%)
 rename {tests => maven-plugin/tests}/catalog-xml/pom.xml (100%)
 rename {tests => maven-plugin/tests}/catalog-xml/src/main/resources/catalog.xml (100%)
 rename {tests => maven-plugin/tests}/catalog-xml/src/main/resources/schema_a.xsd (100%)
 rename {tests => maven-plugin/tests}/catalog-xml/src/main/resources/schema_b.xsd (100%)
 rename {tests => maven-plugin/tests}/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java (100%)
 rename {tests => maven-plugin/tests}/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java (100%)
 rename {tests => maven-plugin/tests}/catalog/.gitignore (100%)
 rename {tests => maven-plugin/tests}/catalog/pom.xml (100%)
 rename {tests => maven-plugin/tests}/catalog/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/catalog/src/main/resources/schema_a.xsd (100%)
 rename {tests => maven-plugin/tests}/catalog/src/main/resources/schema_b.xsd (100%)
 rename {tests => maven-plugin/tests}/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java (100%)
 rename {tests => maven-plugin/tests}/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java (100%)
 rename {tests => maven-plugin/tests}/episodes/a/.gitignore (100%)
 rename {tests => maven-plugin/tests}/episodes/a/pom.xml (100%)
 rename {tests => maven-plugin/tests}/episodes/a/src/main/resources/a.xjb (100%)
 rename {tests => maven-plugin/tests}/episodes/a/src/main/resources/a.xsd (100%)
 rename {tests => maven-plugin/tests}/episodes/b/.gitignore (100%)
 rename {tests => maven-plugin/tests}/episodes/b/pom.xml (100%)
 rename {tests => maven-plugin/tests}/episodes/b/src/main/resources/b.xsd (100%)
 rename {tests => maven-plugin/tests}/episodes/b/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/episodes/c/.gitignore (100%)
 rename {tests => maven-plugin/tests}/episodes/c/pom.xml (100%)
 rename {tests => maven-plugin/tests}/episodes/c/src/main/resources/c.xsd (100%)
 rename {tests => maven-plugin/tests}/episodes/d/.gitignore (100%)
 rename {tests => maven-plugin/tests}/episodes/d/pom.xml (100%)
 rename {tests => maven-plugin/tests}/episodes/d/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/episodes/d/src/main/resources/d.xsd (100%)
 rename {tests => maven-plugin/tests}/episodes/e/.gitignore (100%)
 rename {tests => maven-plugin/tests}/episodes/e/pom.xml (100%)
 rename {tests => maven-plugin/tests}/episodes/e/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/episodes/e/src/main/resources/d.xsd (100%)
 rename {tests => maven-plugin/tests}/episodes/pom.xml (100%)
 rename {tests => maven-plugin/tests}/full-build-1.7.bat (100%)
 rename {tests => maven-plugin/tests}/full-build-1.8.bat (100%)
 rename {tests => maven-plugin/tests}/full-build-9.bat (100%)
 rename {tests => maven-plugin/tests}/gh-issue-16/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-16/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-16/src/main/resources/ab/a.xjb (100%)
 rename {tests => maven-plugin/tests}/gh-issue-16/src/main/resources/ab/a.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-16/src/main/resources/ab/b.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-16/src/main/resources/ab/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/a/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/a/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/a/src/main/resources/a/a.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/b/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/b/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/b/src/main/resources/b/b.cat (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/b/src/main/resources/b/b.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-19/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-22/a/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-22/a/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-22/a/src/main/resources/a.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-22/b/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-22/b/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-22/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/one-non-strict/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/one-non-strict/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/one-non-strict/src/main/resources/META-INF/one/catalog.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/one-non-strict/src/main/resources/one/a.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/one-non-strict/src/main/resources/one/b.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/one-non-strict/src/main/resources/one/b1.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/one-non-strict/src/main/resources/two/p.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/two-non-strict/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/two-non-strict/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/two-non-strict/src/main/resources/META-INF/two/catalog.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/two-non-strict/src/main/resources/one/a.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/two-non-strict/src/main/resources/one/b.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/two-non-strict/src/main/resources/one/b1.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-23/two-non-strict/src/main/resources/two/p.xsd (100%)
 rename {tests => maven-plugin/tests}/gh-issue-58/.gitignore (100%)
 rename {tests => maven-plugin/tests}/gh-issue-58/pom.xml (100%)
 rename {tests => maven-plugin/tests}/gh-issue-58/src/main/resources/purchaseorder.xsd (100%)
 rename {tests => maven-plugin/tests}/issues/.gitignore (100%)
 rename {tests => maven-plugin/tests}/issues/pom.xml (100%)
 rename {tests => maven-plugin/tests}/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java (100%)
 rename {tests => maven-plugin/tests}/issues/src/main/resources/binding.xjb (100%)
 rename {tests => maven-plugin/tests}/issues/src/main/resources/depends.dep (100%)
 rename {tests => maven-plugin/tests}/issues/src/main/resources/depends.txt (100%)
 rename {tests => maven-plugin/tests}/issues/src/main/resources/schema.xsd (100%)
 rename {tests => maven-plugin/tests}/issues/src/test/resources/log4j.properties (100%)
 rename {tests => maven-plugin/tests}/java-9/.gitignore (100%)
 rename {tests => maven-plugin/tests}/java-9/install-10.bat (100%)
 rename {tests => maven-plugin/tests}/java-9/install-8.bat (100%)
 rename {tests => maven-plugin/tests}/java-9/install-9.bat (100%)
 rename {tests => maven-plugin/tests}/java-9/pom.xml (100%)
 rename {tests => maven-plugin/tests}/java-9/src/main/resources/SimpleClass.xsd (100%)
 rename {tests => maven-plugin/tests}/java-9/src/main/resources/SimpleClassWithOtherName.xsd (100%)
 rename {tests => maven-plugin/tests}/java-9/src/main/resources/SimpleClassWithPackage.xsd (100%)
 rename {tests => maven-plugin/tests}/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java (100%)
 rename {tests => maven-plugin/tests}/p_o/.gitignore (100%)
 rename {tests => maven-plugin/tests}/p_o/pom.xml (100%)
 rename {tests => maven-plugin/tests}/p_o/src/main/resources/binding.xjb (100%)
 rename {tests => maven-plugin/tests}/p_o/src/main/resources/purchaseorder.xsd (100%)
 rename {tests => maven-plugin/tests}/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java (100%)
 rename {tests => maven-plugin/tests}/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java (100%)
 rename {tests => maven-plugin/tests}/po-2.3/.gitignore (100%)
 rename {tests => maven-plugin/tests}/po-2.3/pom.xml (100%)
 rename {tests => maven-plugin/tests}/po-2.3/src/main/resources/purchaseorder.xsd (100%)
 rename {tests => maven-plugin/tests}/po-scd/.gitignore (100%)
 rename {tests => maven-plugin/tests}/po-scd/build-1.5.bat (100%)
 rename {tests => maven-plugin/tests}/po-scd/build-1.6.bat (100%)
 rename {tests => maven-plugin/tests}/po-scd/pom.xml (100%)
 rename {tests => maven-plugin/tests}/po-scd/src/main/resources/bindings.xjb (100%)
 rename {tests => maven-plugin/tests}/po-scd/src/main/resources/purchaseorder.xsd (100%)
 rename {tests => maven-plugin/tests}/pom.xml (100%)
 rename {tests => maven-plugin/tests}/res/.gitignore (100%)
 rename {tests => maven-plugin/tests}/res/pom.xml (100%)
 rename {tests => maven-plugin/tests}/res/src/main/resources/bindings.xjb (100%)
 rename {tests => maven-plugin/tests}/res/src/main/resources/catalog.cat (100%)
 rename {tests => maven-plugin/tests}/res/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd (100%)
 rename {tests => maven-plugin/tests}/res/src/main/schemas/schema.xs (100%)
 rename {tests => maven-plugin/tests}/res/src/main/schemas/schema.xsd (100%)
 rename {tests => maven-plugin/tests}/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java (100%)
 rename {tests => maven-plugin/tests}/rnc/.gitignore (100%)
 rename {tests => maven-plugin/tests}/rnc/pom.xml (100%)
 rename {tests => maven-plugin/tests}/rnc/src/main/resources/georss.rnc (100%)
 rename {tests => maven-plugin/tests}/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java (100%)
 rename {tests => maven-plugin/tests}/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java (100%)
 rename {tests => maven-plugin/tests}/tse/.gitignore (100%)
 rename {tests => maven-plugin/tests}/tse/pom.xml (100%)
 rename {tests => maven-plugin/tests}/tse/src/main/java/a/A2Enum.java (100%)
 rename {tests => maven-plugin/tests}/tse/src/main/java/a/ObjectFactory.java (100%)
 rename {tests => maven-plugin/tests}/tse/src/main/resources/a.xsd (100%)
 rename {tests => maven-plugin/tests}/tse/src/main/resources/b.xsd (100%)
 rename {tests => maven-plugin/tests}/two/.gitignore (100%)
 rename {tests => maven-plugin/tests}/two/build-1.5.bat (100%)
 rename {tests => maven-plugin/tests}/two/build-1.6.bat (100%)
 rename {tests => maven-plugin/tests}/two/pom.xml (100%)
 rename {tests => maven-plugin/tests}/two/src/main/resources/schema.xs (100%)
 rename {tests => maven-plugin/tests}/two/src/main/resources/schema.xsd (100%)
 rename {tests => maven-plugin/tests}/two/src/test/resources/log4j.properties (100%)
 rename {tests => maven-plugin/tests}/two/src/test/samples/1.xml (100%)
 rename {tests => maven-plugin/tests}/wsdl-file/.gitignore (100%)
 rename {tests => maven-plugin/tests}/wsdl-file/build-1.5.bat (100%)
 rename {tests => maven-plugin/tests}/wsdl-file/build-1.6.bat (100%)
 rename {tests => maven-plugin/tests}/wsdl-file/pom.xml (100%)
 rename {tests => maven-plugin/tests}/wsdl-file/src/main/resources/pedidowebservice.wsdl (100%)
 rename {tests => maven-plugin/tests}/wsdl-file/src/test/java/net/webservicex/test/JAXBContextTest.java (100%)
 rename {tests => maven-plugin/tests}/wsdl/.gitignore (100%)
 rename {tests => maven-plugin/tests}/wsdl/build-1.5.bat (100%)
 rename {tests => maven-plugin/tests}/wsdl/build-1.6.bat (100%)
 rename {tests => maven-plugin/tests}/wsdl/pom.xml (100%)
 rename {tests => maven-plugin/tests}/wsdl/src/test/java/net/webservicex/test/JAXBContextTest.java (100%)
 rename {tests => maven-plugin/tests}/xjc-simple/.gitignore (100%)
 rename {tests => maven-plugin/tests}/xjc-simple/pom.xml (100%)
 rename {tests => maven-plugin/tests}/xjc-simple/src/main/resources/purchaseorder.xjb (100%)
 rename {tests => maven-plugin/tests}/xjc-simple/src/main/resources/purchaseorder.xsd (100%)
 rename {www => maven-plugin/www}/alm-process/snippets/page.xml (100%)
 rename {www => maven-plugin/www}/docs/guide.html (100%)
 rename {www => maven-plugin/www}/index.html (100%)
 rename {www => maven-plugin/www}/project_tools.html (100%)

diff --git a/dist/.gitignore b/maven-plugin/dist/.gitignore
similarity index 100%
rename from dist/.gitignore
rename to maven-plugin/dist/.gitignore
diff --git a/dist/pom.xml b/maven-plugin/dist/pom.xml
similarity index 100%
rename from dist/pom.xml
rename to maven-plugin/dist/pom.xml
diff --git a/plugin-core/.gitignore b/maven-plugin/plugin-core/.gitignore
similarity index 100%
rename from plugin-core/.gitignore
rename to maven-plugin/plugin-core/.gitignore
diff --git a/plugin-core/pom.xml b/maven-plugin/plugin-core/pom.xml
similarity index 97%
rename from plugin-core/pom.xml
rename to maven-plugin/plugin-core/pom.xml
index e179f6093..9b1fb3e7a 100644
--- a/plugin-core/pom.xml
+++ b/maven-plugin/plugin-core/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jaxb-maven-plugin-core</artifactId>
 	<packaging>jar</packaging>
-	<name>Maven JAXB Plugin Core</name>
+	<name>JAXB Tools :: Maven Plugin :: Core</name>
 	<parent>
 		<groupId>org.jvnet.jaxb</groupId>
 		<artifactId>jaxb-maven-plugin-project</artifactId>
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/AbstractXJC2Mojo.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResource.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/DependencyResourceResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/IOptionsFactory.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/OptionsConfiguration.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/ParentFirstClassLoader.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/ResourceEntry.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractHTTPURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/AbstractSchemeAwareURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/CompositeURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/FileURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/HttpsURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/JarURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/SchemeAwareURILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/net/URILastModifiedResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/plugin/logging/NullLog.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ClasspathCatalogResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/MavenCatalogResolver.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingEntityResolverWrapper.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/resolver/tools/ReResolvingInputSourceWrapper.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/ArtifactUtils.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/CollectionUtils.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/LocaleUtils.java
diff --git a/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java
similarity index 100%
rename from plugin-core/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java
rename to maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/StringUtils.java
diff --git a/plugin-core/src/main/resources/org/jvnet/jaxb/maven/addIfExistsToEpisodeSchemaBindings.xslt b/maven-plugin/plugin-core/src/main/resources/org/jvnet/jaxb/maven/addIfExistsToEpisodeSchemaBindings.xslt
similarity index 100%
rename from plugin-core/src/main/resources/org/jvnet/jaxb/maven/addIfExistsToEpisodeSchemaBindings.xslt
rename to maven-plugin/plugin-core/src/main/resources/org/jvnet/jaxb/maven/addIfExistsToEpisodeSchemaBindings.xslt
diff --git a/plugin-core/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java
similarity index 100%
rename from plugin-core/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java
rename to maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/RawXJC2MojoTest.java
diff --git a/plugin-core/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java
similarity index 100%
rename from plugin-core/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java
rename to maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/net/tests/URILastModifiedResolverTest.java
diff --git a/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java
similarity index 100%
rename from plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java
rename to maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/resolver/tools/tests/MavenCatalogResolverTest.java
diff --git a/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java
similarity index 100%
rename from plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java
rename to maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/AddIfExistsToEpisodeSchemaBindingsTest.java
diff --git a/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java
similarity index 100%
rename from plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java
rename to maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/tests/DependencyResourceTest.java
diff --git a/plugin-core/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java b/maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java
similarity index 100%
rename from plugin-core/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java
rename to maven-plugin/plugin-core/src/test/java/org/jvnet/jaxb/maven/util/tests/CollectionsUtilsTests.java
diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/catalog.cat b/maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/catalog.cat
similarity index 100%
rename from plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/catalog.cat
rename to maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/catalog.cat
diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/w3c/1999/xlink.xsd b/maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/w3c/1999/xlink.xsd
similarity index 100%
rename from plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/w3c/1999/xlink.xsd
rename to maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/a/w3c/1999/xlink.xsd
diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/catalog.cat b/maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/catalog.cat
similarity index 100%
rename from plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/catalog.cat
rename to maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/catalog.cat
diff --git a/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd b/maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd
similarity index 100%
rename from plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd
rename to maven-plugin/plugin-core/src/test/resources/org/jvnet/jaxb/maven/resolver/tools/tests/b/w3c/2005/atom-author-link.xsd
diff --git a/plugin/.gitignore b/maven-plugin/plugin/.gitignore
similarity index 100%
rename from plugin/.gitignore
rename to maven-plugin/plugin/.gitignore
diff --git a/plugin/pom.xml b/maven-plugin/plugin/pom.xml
similarity index 96%
rename from plugin/pom.xml
rename to maven-plugin/plugin/pom.xml
index 9f64812d8..55443244c 100644
--- a/plugin/pom.xml
+++ b/maven-plugin/plugin/pom.xml
@@ -2,8 +2,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jaxb-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
-	<name>Maven JAXB Plugin</name>
-	<url>https://github.com/highsource/maven-jaxb2-plugin</url>
+	<name>JAXB Tools :: Maven Plugin :: Plugin</name>
+	<url>https://github.com/highsource/jaxb-tools</url>
 	<parent>
 		<groupId>org.jvnet.jaxb</groupId>
 		<artifactId>jaxb-maven-plugin-project</artifactId>
diff --git a/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java b/maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java
similarity index 100%
rename from plugin/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java
rename to maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingCodeWriter.java
diff --git a/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java b/maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java
similarity index 100%
rename from plugin/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java
rename to maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/LoggingErrorReceiver.java
diff --git a/plugin/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java b/maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java
similarity index 100%
rename from plugin/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java
rename to maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/OptionsFactory.java
diff --git a/plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java b/maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java
similarity index 100%
rename from plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java
rename to maven-plugin/plugin/src/main/java/org/jvnet/jaxb/maven/XJC2Mojo.java
diff --git a/plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/maven-plugin/plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
similarity index 100%
rename from plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
rename to maven-plugin/plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
diff --git a/plugin/src/site/site.xml b/maven-plugin/plugin/src/site/site.xml
similarity index 100%
rename from plugin/src/site/site.xml
rename to maven-plugin/plugin/src/site/site.xml
diff --git a/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java b/maven-plugin/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java
similarity index 100%
rename from plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java
rename to maven-plugin/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTest.java
diff --git a/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java b/maven-plugin/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java
similarity index 100%
rename from plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java
rename to maven-plugin/plugin/src/test/java/org/jvnet/jaxb/maven/JAXBGenerateTestSuite.java
diff --git a/plugin/src/test/resources/purchaseorder.xsd b/maven-plugin/plugin/src/test/resources/purchaseorder.xsd
similarity index 100%
rename from plugin/src/test/resources/purchaseorder.xsd
rename to maven-plugin/plugin/src/test/resources/purchaseorder.xsd
diff --git a/plugin/src/test/resources/test-pom.xml b/maven-plugin/plugin/src/test/resources/test-pom.xml
similarity index 100%
rename from plugin/src/test/resources/test-pom.xml
rename to maven-plugin/plugin/src/test/resources/test-pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
new file mode 100644
index 000000000..57b3b5d15
--- /dev/null
+++ b/maven-plugin/pom.xml
@@ -0,0 +1,81 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+        <parent>
+             <groupId>org.jvnet.jaxb</groupId>
+             <artifactId>jaxb-tools-project</artifactId>
+	     <version>2.0.3-SNAPSHOT</version>
+             <relativePath>../pom.xml</relativePath>
+        </parent>
+	<artifactId>jaxb-maven-plugin-project</artifactId>
+	<packaging>pom</packaging>
+	<name>JAXB Tools :: Maven Plugin :: Project</name>
+	<description>Maven plugin for JAXB XJC compiler to generate Java sources from XML Schemas.</description>
+	<modules>
+		<module>plugin-core</module>
+		<module>plugin</module>
+		<module>testing</module>
+	</modules>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.version>2.0.9</maven.version>
+		<jaxb23.version>2.3.7</jaxb23.version>
+		<jaxb-api.version>2.3.3</jaxb-api.version>
+		<jaxb.version>${jaxb23.version}</jaxb.version>
+		<stax-ex.version>1.8.3</stax-ex.version>
+		<fastinfoset.version>1.2.18</fastinfoset.version>
+		<dtd-parser.version>1.4.5</dtd-parser.version>
+		<istack.version>3.0.12</istack.version>
+		<activation.version>1.2.2</activation.version>
+		<jaxb2-basics.version>0.12.0</jaxb2-basics.version>
+		<maven.plugin.testing.version>2.1</maven.plugin.testing.version>
+		<maven.plugin.plugin.version>3.7.1</maven.plugin.plugin.version>
+		<maven-nexus-staging-maven-plugin.version>1.6.8</maven-nexus-staging-maven-plugin.version>
+		<slf4j.version>1.7.25</slf4j.version>
+	</properties>
+	<profiles>
+		<profile>
+			<id>samples</id>
+			<activation>
+				<property>
+					<name>samples</name>
+				</property>
+			</activation>
+			<modules>
+				<module>samples</module>
+				<module>dist</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>tests</id>
+			<activation>
+				<property>
+					<name>tests</name>
+				</property>
+			</activation>
+			<modules>
+				<module>tests</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>all</id>
+			<activation>
+				<property>
+					<name>all</name>
+				</property>
+			</activation>
+			<modules>
+				<module>dist</module>
+				<module>samples</module>
+				<module>tests</module>
+			</modules>
+		</profile>
+	</profiles>
+	<dependencies>
+		<!-- JUnit -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/qrelease.bat b/maven-plugin/qrelease.bat
similarity index 100%
rename from qrelease.bat
rename to maven-plugin/qrelease.bat
diff --git a/samples/catalog/.gitignore b/maven-plugin/samples/catalog/.gitignore
similarity index 100%
rename from samples/catalog/.gitignore
rename to maven-plugin/samples/catalog/.gitignore
diff --git a/samples/catalog/pom.xml b/maven-plugin/samples/catalog/pom.xml
similarity index 100%
rename from samples/catalog/pom.xml
rename to maven-plugin/samples/catalog/pom.xml
diff --git a/samples/catalog/project-pom.xml b/maven-plugin/samples/catalog/project-pom.xml
similarity index 100%
rename from samples/catalog/project-pom.xml
rename to maven-plugin/samples/catalog/project-pom.xml
diff --git a/samples/catalog/src/main/assembly/maven-src.xml b/maven-plugin/samples/catalog/src/main/assembly/maven-src.xml
similarity index 100%
rename from samples/catalog/src/main/assembly/maven-src.xml
rename to maven-plugin/samples/catalog/src/main/assembly/maven-src.xml
diff --git a/samples/catalog/src/main/resources/catalog.cat b/maven-plugin/samples/catalog/src/main/resources/catalog.cat
similarity index 100%
rename from samples/catalog/src/main/resources/catalog.cat
rename to maven-plugin/samples/catalog/src/main/resources/catalog.cat
diff --git a/samples/catalog/src/main/resources/schema_a.xsd b/maven-plugin/samples/catalog/src/main/resources/schema_a.xsd
similarity index 100%
rename from samples/catalog/src/main/resources/schema_a.xsd
rename to maven-plugin/samples/catalog/src/main/resources/schema_a.xsd
diff --git a/samples/catalog/src/main/resources/schema_b.xsd b/maven-plugin/samples/catalog/src/main/resources/schema_b.xsd
similarity index 100%
rename from samples/catalog/src/main/resources/schema_b.xsd
rename to maven-plugin/samples/catalog/src/main/resources/schema_b.xsd
diff --git a/samples/dtd/.gitignore b/maven-plugin/samples/dtd/.gitignore
similarity index 100%
rename from samples/dtd/.gitignore
rename to maven-plugin/samples/dtd/.gitignore
diff --git a/samples/dtd/pom.xml b/maven-plugin/samples/dtd/pom.xml
similarity index 100%
rename from samples/dtd/pom.xml
rename to maven-plugin/samples/dtd/pom.xml
diff --git a/samples/dtd/project-pom.xml b/maven-plugin/samples/dtd/project-pom.xml
similarity index 100%
rename from samples/dtd/project-pom.xml
rename to maven-plugin/samples/dtd/project-pom.xml
diff --git a/samples/dtd/src/main/assembly/maven-src.xml b/maven-plugin/samples/dtd/src/main/assembly/maven-src.xml
similarity index 100%
rename from samples/dtd/src/main/assembly/maven-src.xml
rename to maven-plugin/samples/dtd/src/main/assembly/maven-src.xml
diff --git a/samples/dtd/src/main/resources/binding.xjb b/maven-plugin/samples/dtd/src/main/resources/binding.xjb
similarity index 100%
rename from samples/dtd/src/main/resources/binding.xjb
rename to maven-plugin/samples/dtd/src/main/resources/binding.xjb
diff --git a/samples/dtd/src/main/resources/hibernate-mapping.dtd b/maven-plugin/samples/dtd/src/main/resources/hibernate-mapping.dtd
similarity index 100%
rename from samples/dtd/src/main/resources/hibernate-mapping.dtd
rename to maven-plugin/samples/dtd/src/main/resources/hibernate-mapping.dtd
diff --git a/samples/episode/.gitignore b/maven-plugin/samples/episode/.gitignore
similarity index 100%
rename from samples/episode/.gitignore
rename to maven-plugin/samples/episode/.gitignore
diff --git a/samples/episode/a/project-pom.xml b/maven-plugin/samples/episode/a/project-pom.xml
similarity index 100%
rename from samples/episode/a/project-pom.xml
rename to maven-plugin/samples/episode/a/project-pom.xml
diff --git a/samples/episode/a/src/main/resources/a.xsd b/maven-plugin/samples/episode/a/src/main/resources/a.xsd
similarity index 100%
rename from samples/episode/a/src/main/resources/a.xsd
rename to maven-plugin/samples/episode/a/src/main/resources/a.xsd
diff --git a/samples/episode/b/project-pom.xml b/maven-plugin/samples/episode/b/project-pom.xml
similarity index 100%
rename from samples/episode/b/project-pom.xml
rename to maven-plugin/samples/episode/b/project-pom.xml
diff --git a/samples/episode/b/src/main/resources/b.xsd b/maven-plugin/samples/episode/b/src/main/resources/b.xsd
similarity index 100%
rename from samples/episode/b/src/main/resources/b.xsd
rename to maven-plugin/samples/episode/b/src/main/resources/b.xsd
diff --git a/samples/episode/b/src/main/resources/catalog.cat b/maven-plugin/samples/episode/b/src/main/resources/catalog.cat
similarity index 100%
rename from samples/episode/b/src/main/resources/catalog.cat
rename to maven-plugin/samples/episode/b/src/main/resources/catalog.cat
diff --git a/samples/episode/c/project-pom.xml b/maven-plugin/samples/episode/c/project-pom.xml
similarity index 100%
rename from samples/episode/c/project-pom.xml
rename to maven-plugin/samples/episode/c/project-pom.xml
diff --git a/samples/episode/c/src/main/resources/c.xsd b/maven-plugin/samples/episode/c/src/main/resources/c.xsd
similarity index 100%
rename from samples/episode/c/src/main/resources/c.xsd
rename to maven-plugin/samples/episode/c/src/main/resources/c.xsd
diff --git a/samples/episode/pom.xml b/maven-plugin/samples/episode/pom.xml
similarity index 100%
rename from samples/episode/pom.xml
rename to maven-plugin/samples/episode/pom.xml
diff --git a/samples/episode/project-pom.xml b/maven-plugin/samples/episode/project-pom.xml
similarity index 100%
rename from samples/episode/project-pom.xml
rename to maven-plugin/samples/episode/project-pom.xml
diff --git a/samples/episode/src/main/assembly/maven-src.xml b/maven-plugin/samples/episode/src/main/assembly/maven-src.xml
similarity index 100%
rename from samples/episode/src/main/assembly/maven-src.xml
rename to maven-plugin/samples/episode/src/main/assembly/maven-src.xml
diff --git a/samples/jaxbplugins/.gitignore b/maven-plugin/samples/jaxbplugins/.gitignore
similarity index 100%
rename from samples/jaxbplugins/.gitignore
rename to maven-plugin/samples/jaxbplugins/.gitignore
diff --git a/samples/jaxbplugins/pom.xml b/maven-plugin/samples/jaxbplugins/pom.xml
similarity index 100%
rename from samples/jaxbplugins/pom.xml
rename to maven-plugin/samples/jaxbplugins/pom.xml
diff --git a/samples/jaxbplugins/project-pom.xml b/maven-plugin/samples/jaxbplugins/project-pom.xml
similarity index 100%
rename from samples/jaxbplugins/project-pom.xml
rename to maven-plugin/samples/jaxbplugins/project-pom.xml
diff --git a/samples/jaxbplugins/src/main/assembly/maven-src.xml b/maven-plugin/samples/jaxbplugins/src/main/assembly/maven-src.xml
similarity index 100%
rename from samples/jaxbplugins/src/main/assembly/maven-src.xml
rename to maven-plugin/samples/jaxbplugins/src/main/assembly/maven-src.xml
diff --git a/samples/jaxbplugins/src/main/resources/purchaseorder.xsd b/maven-plugin/samples/jaxbplugins/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from samples/jaxbplugins/src/main/resources/purchaseorder.xsd
rename to maven-plugin/samples/jaxbplugins/src/main/resources/purchaseorder.xsd
diff --git a/samples/po/.gitignore b/maven-plugin/samples/po/.gitignore
similarity index 100%
rename from samples/po/.gitignore
rename to maven-plugin/samples/po/.gitignore
diff --git a/samples/po/pom.xml b/maven-plugin/samples/po/pom.xml
similarity index 100%
rename from samples/po/pom.xml
rename to maven-plugin/samples/po/pom.xml
diff --git a/samples/po/project-pom.xml b/maven-plugin/samples/po/project-pom.xml
similarity index 100%
rename from samples/po/project-pom.xml
rename to maven-plugin/samples/po/project-pom.xml
diff --git a/samples/po/src/main/assembly/maven-src.xml b/maven-plugin/samples/po/src/main/assembly/maven-src.xml
similarity index 100%
rename from samples/po/src/main/assembly/maven-src.xml
rename to maven-plugin/samples/po/src/main/assembly/maven-src.xml
diff --git a/samples/po/src/main/resources/purchaseorder.xsd b/maven-plugin/samples/po/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from samples/po/src/main/resources/purchaseorder.xsd
rename to maven-plugin/samples/po/src/main/resources/purchaseorder.xsd
diff --git a/samples/pom.xml b/maven-plugin/samples/pom.xml
similarity index 100%
rename from samples/pom.xml
rename to maven-plugin/samples/pom.xml
diff --git a/src/site/site.xml b/maven-plugin/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to maven-plugin/src/site/site.xml
diff --git a/testing/.gitignore b/maven-plugin/testing/.gitignore
similarity index 100%
rename from testing/.gitignore
rename to maven-plugin/testing/.gitignore
diff --git a/testing/pom.xml b/maven-plugin/testing/pom.xml
similarity index 100%
rename from testing/pom.xml
rename to maven-plugin/testing/pom.xml
diff --git a/testing/src/main/java/org/jvnet/jaxb/maven/test/RunXJC2Mojo.java b/maven-plugin/testing/src/main/java/org/jvnet/jaxb/maven/test/RunXJC2Mojo.java
similarity index 100%
rename from testing/src/main/java/org/jvnet/jaxb/maven/test/RunXJC2Mojo.java
rename to maven-plugin/testing/src/main/java/org/jvnet/jaxb/maven/test/RunXJC2Mojo.java
diff --git a/testing/src/main/java/org/jvnet/jaxb/maven/test/plugin/foo/FooPlugin.java b/maven-plugin/testing/src/main/java/org/jvnet/jaxb/maven/test/plugin/foo/FooPlugin.java
similarity index 100%
rename from testing/src/main/java/org/jvnet/jaxb/maven/test/plugin/foo/FooPlugin.java
rename to maven-plugin/testing/src/main/java/org/jvnet/jaxb/maven/test/plugin/foo/FooPlugin.java
diff --git a/testing/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin b/maven-plugin/testing/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
similarity index 100%
rename from testing/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
rename to maven-plugin/testing/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
diff --git a/testing/src/site/site.xml b/maven-plugin/testing/src/site/site.xml
similarity index 100%
rename from testing/src/site/site.xml
rename to maven-plugin/testing/src/site/site.xml
diff --git a/testing/src/test/java/org/jvnet/jaxb/maven/test/plugin/foo/tests/RunFooPlugin.java b/maven-plugin/testing/src/test/java/org/jvnet/jaxb/maven/test/plugin/foo/tests/RunFooPlugin.java
similarity index 100%
rename from testing/src/test/java/org/jvnet/jaxb/maven/test/plugin/foo/tests/RunFooPlugin.java
rename to maven-plugin/testing/src/test/java/org/jvnet/jaxb/maven/test/plugin/foo/tests/RunFooPlugin.java
diff --git a/testing/src/test/resources/log4j.properties b/maven-plugin/testing/src/test/resources/log4j.properties
similarity index 100%
rename from testing/src/test/resources/log4j.properties
rename to maven-plugin/testing/src/test/resources/log4j.properties
diff --git a/testing/src/test/resources/purchaseorder.xsd b/maven-plugin/testing/src/test/resources/purchaseorder.xsd
similarity index 100%
rename from testing/src/test/resources/purchaseorder.xsd
rename to maven-plugin/testing/src/test/resources/purchaseorder.xsd
diff --git a/tests/JAXB-1044/.gitignore b/maven-plugin/tests/JAXB-1044/.gitignore
similarity index 100%
rename from tests/JAXB-1044/.gitignore
rename to maven-plugin/tests/JAXB-1044/.gitignore
diff --git a/tests/JAXB-1044/pom.xml b/maven-plugin/tests/JAXB-1044/pom.xml
similarity index 100%
rename from tests/JAXB-1044/pom.xml
rename to maven-plugin/tests/JAXB-1044/pom.xml
diff --git a/tests/JAXB-1044/src/main/resources/a.xjb b/maven-plugin/tests/JAXB-1044/src/main/resources/a.xjb
similarity index 100%
rename from tests/JAXB-1044/src/main/resources/a.xjb
rename to maven-plugin/tests/JAXB-1044/src/main/resources/a.xjb
diff --git a/tests/JAXB-1044/src/main/resources/a.xsd b/maven-plugin/tests/JAXB-1044/src/main/resources/a.xsd
similarity index 100%
rename from tests/JAXB-1044/src/main/resources/a.xsd
rename to maven-plugin/tests/JAXB-1044/src/main/resources/a.xsd
diff --git a/tests/JAXB-1044/src/main/resources/b.xsd b/maven-plugin/tests/JAXB-1044/src/main/resources/b.xsd
similarity index 100%
rename from tests/JAXB-1044/src/main/resources/b.xsd
rename to maven-plugin/tests/JAXB-1044/src/main/resources/b.xsd
diff --git a/tests/JAXB-1044/src/main/resources/catalog.cat b/maven-plugin/tests/JAXB-1044/src/main/resources/catalog.cat
similarity index 100%
rename from tests/JAXB-1044/src/main/resources/catalog.cat
rename to maven-plugin/tests/JAXB-1044/src/main/resources/catalog.cat
diff --git a/tests/JAXB-1044/src/test/java/org/jvnet/jaxb/maven/tests/JAXB_1044/RunJAXB_1044Mojo.java b/maven-plugin/tests/JAXB-1044/src/test/java/org/jvnet/jaxb/maven/tests/JAXB_1044/RunJAXB_1044Mojo.java
similarity index 100%
rename from tests/JAXB-1044/src/test/java/org/jvnet/jaxb/maven/tests/JAXB_1044/RunJAXB_1044Mojo.java
rename to maven-plugin/tests/JAXB-1044/src/test/java/org/jvnet/jaxb/maven/tests/JAXB_1044/RunJAXB_1044Mojo.java
diff --git a/tests/MAVEN_JAXB2_PLUGIN-49/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-49/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-49/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-49/src/main/resources/catalog.cat b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/src/main/resources/catalog.cat
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-49/src/main/resources/catalog.cat
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/src/main/resources/catalog.cat
diff --git a/tests/MAVEN_JAXB2_PLUGIN-49/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-49/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-49/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/a/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/a/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/a/src/main/resources/a.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/src/main/resources/a.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/a/src/main/resources/a.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/a/src/main/resources/a.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/b/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/b.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/b.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/b.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/b.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/src/main/resources/catalog.cat
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/b/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_53/b/RunMAVEN_JAXB2_PLUGIN_53Mojo.java
diff --git a/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-53/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-53/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-69/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-69/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-69/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-69/src/main/resources/simple.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/src/main/resources/simple.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-69/src/main/resources/simple.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-69/src/main/resources/simple.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-70/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-70/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-70/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-70/src/main/resources/bindings.xjb b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/src/main/resources/bindings.xjb
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-70/src/main/resources/bindings.xjb
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-70/src/main/resources/bindings.xjb
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/CommonTypes.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/CommonTypes.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/CommonTypes.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/CommonTypes.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/ISOCurrencyCodeType-V2008.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/ISOCurrencyCodeType-V2008.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/ISOCurrencyCodeType-V2008.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/common-types/src/main/resources/META-INF/project/schemas/ISOCurrencyCodeType-V2008.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/service/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/jaxb/catalog.cat b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/jaxb/catalog.cat
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/jaxb/catalog.cat
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/jaxb/catalog.cat
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/resources/META-INF/project/schemas/Service.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/resources/META-INF/project/schemas/Service.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/resources/META-INF/project/schemas/Service.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/src/main/resources/META-INF/project/schemas/Service.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-77/service/src/test/java/org/jvnet/jaxb/maven/tests/MAVEN_JAXB2_PLUGIN_77/RunMAVEN_JAXB2_PLUGIN_77Mojo.java
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/a/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/a/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xjb b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xjb
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xjb
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xjb
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/a/src/main/resources/a.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/b/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/b/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/b.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/b.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/b.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/b.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/b/src/main/resources/catalog.cat
diff --git a/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-79/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-79/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/a/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/a/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/a/src/main/resources/a.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/src/main/resources/a.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/a/src/main/resources/a.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/a/src/main/resources/a.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/b/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xjb b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xjb
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xjb
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xjb
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/b.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/b/src/main/resources/catalog.cat
diff --git a/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-82/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-82/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-86/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-86/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-86/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/a/a.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/a/a.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/a/a.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/a/a.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/b/b.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/b/b.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/b/b.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-86/src/main/resources/b/b.xsd
diff --git a/tests/MAVEN_JAXB2_PLUGIN-87/.gitignore b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/.gitignore
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-87/.gitignore
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/.gitignore
diff --git a/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-87/pom.xml
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/pom.xml
diff --git a/tests/MAVEN_JAXB2_PLUGIN-87/src/main/resources/purchaseorder.xsd b/maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from tests/MAVEN_JAXB2_PLUGIN-87/src/main/resources/purchaseorder.xsd
rename to maven-plugin/tests/MAVEN_JAXB2_PLUGIN-87/src/main/resources/purchaseorder.xsd
diff --git a/tests/catalog-xml/.gitignore b/maven-plugin/tests/catalog-xml/.gitignore
similarity index 100%
rename from tests/catalog-xml/.gitignore
rename to maven-plugin/tests/catalog-xml/.gitignore
diff --git a/tests/catalog-xml/pom.xml b/maven-plugin/tests/catalog-xml/pom.xml
similarity index 100%
rename from tests/catalog-xml/pom.xml
rename to maven-plugin/tests/catalog-xml/pom.xml
diff --git a/tests/catalog-xml/src/main/resources/catalog.xml b/maven-plugin/tests/catalog-xml/src/main/resources/catalog.xml
similarity index 100%
rename from tests/catalog-xml/src/main/resources/catalog.xml
rename to maven-plugin/tests/catalog-xml/src/main/resources/catalog.xml
diff --git a/tests/catalog-xml/src/main/resources/schema_a.xsd b/maven-plugin/tests/catalog-xml/src/main/resources/schema_a.xsd
similarity index 100%
rename from tests/catalog-xml/src/main/resources/schema_a.xsd
rename to maven-plugin/tests/catalog-xml/src/main/resources/schema_a.xsd
diff --git a/tests/catalog-xml/src/main/resources/schema_b.xsd b/maven-plugin/tests/catalog-xml/src/main/resources/schema_b.xsd
similarity index 100%
rename from tests/catalog-xml/src/main/resources/schema_b.xsd
rename to maven-plugin/tests/catalog-xml/src/main/resources/schema_b.xsd
diff --git a/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java b/maven-plugin/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java
similarity index 100%
rename from tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java
rename to maven-plugin/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java
diff --git a/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java b/maven-plugin/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java
similarity index 100%
rename from tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java
rename to maven-plugin/tests/catalog-xml/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java
diff --git a/tests/catalog/.gitignore b/maven-plugin/tests/catalog/.gitignore
similarity index 100%
rename from tests/catalog/.gitignore
rename to maven-plugin/tests/catalog/.gitignore
diff --git a/tests/catalog/pom.xml b/maven-plugin/tests/catalog/pom.xml
similarity index 100%
rename from tests/catalog/pom.xml
rename to maven-plugin/tests/catalog/pom.xml
diff --git a/tests/catalog/src/main/resources/catalog.cat b/maven-plugin/tests/catalog/src/main/resources/catalog.cat
similarity index 100%
rename from tests/catalog/src/main/resources/catalog.cat
rename to maven-plugin/tests/catalog/src/main/resources/catalog.cat
diff --git a/tests/catalog/src/main/resources/schema_a.xsd b/maven-plugin/tests/catalog/src/main/resources/schema_a.xsd
similarity index 100%
rename from tests/catalog/src/main/resources/schema_a.xsd
rename to maven-plugin/tests/catalog/src/main/resources/schema_a.xsd
diff --git a/tests/catalog/src/main/resources/schema_b.xsd b/maven-plugin/tests/catalog/src/main/resources/schema_b.xsd
similarity index 100%
rename from tests/catalog/src/main/resources/schema_b.xsd
rename to maven-plugin/tests/catalog/src/main/resources/schema_b.xsd
diff --git a/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java b/maven-plugin/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java
similarity index 100%
rename from tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java
rename to maven-plugin/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunCatalogMojo.java
diff --git a/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java b/maven-plugin/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java
similarity index 100%
rename from tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java
rename to maven-plugin/tests/catalog/src/test/java/org/jvnet/jaxb/maven/tests/catalog/RunPlainCatalogMojo.java
diff --git a/tests/episodes/a/.gitignore b/maven-plugin/tests/episodes/a/.gitignore
similarity index 100%
rename from tests/episodes/a/.gitignore
rename to maven-plugin/tests/episodes/a/.gitignore
diff --git a/tests/episodes/a/pom.xml b/maven-plugin/tests/episodes/a/pom.xml
similarity index 100%
rename from tests/episodes/a/pom.xml
rename to maven-plugin/tests/episodes/a/pom.xml
diff --git a/tests/episodes/a/src/main/resources/a.xjb b/maven-plugin/tests/episodes/a/src/main/resources/a.xjb
similarity index 100%
rename from tests/episodes/a/src/main/resources/a.xjb
rename to maven-plugin/tests/episodes/a/src/main/resources/a.xjb
diff --git a/tests/episodes/a/src/main/resources/a.xsd b/maven-plugin/tests/episodes/a/src/main/resources/a.xsd
similarity index 100%
rename from tests/episodes/a/src/main/resources/a.xsd
rename to maven-plugin/tests/episodes/a/src/main/resources/a.xsd
diff --git a/tests/episodes/b/.gitignore b/maven-plugin/tests/episodes/b/.gitignore
similarity index 100%
rename from tests/episodes/b/.gitignore
rename to maven-plugin/tests/episodes/b/.gitignore
diff --git a/tests/episodes/b/pom.xml b/maven-plugin/tests/episodes/b/pom.xml
similarity index 100%
rename from tests/episodes/b/pom.xml
rename to maven-plugin/tests/episodes/b/pom.xml
diff --git a/tests/episodes/b/src/main/resources/b.xsd b/maven-plugin/tests/episodes/b/src/main/resources/b.xsd
similarity index 100%
rename from tests/episodes/b/src/main/resources/b.xsd
rename to maven-plugin/tests/episodes/b/src/main/resources/b.xsd
diff --git a/tests/episodes/b/src/main/resources/catalog.cat b/maven-plugin/tests/episodes/b/src/main/resources/catalog.cat
similarity index 100%
rename from tests/episodes/b/src/main/resources/catalog.cat
rename to maven-plugin/tests/episodes/b/src/main/resources/catalog.cat
diff --git a/tests/episodes/c/.gitignore b/maven-plugin/tests/episodes/c/.gitignore
similarity index 100%
rename from tests/episodes/c/.gitignore
rename to maven-plugin/tests/episodes/c/.gitignore
diff --git a/tests/episodes/c/pom.xml b/maven-plugin/tests/episodes/c/pom.xml
similarity index 100%
rename from tests/episodes/c/pom.xml
rename to maven-plugin/tests/episodes/c/pom.xml
diff --git a/tests/episodes/c/src/main/resources/c.xsd b/maven-plugin/tests/episodes/c/src/main/resources/c.xsd
similarity index 100%
rename from tests/episodes/c/src/main/resources/c.xsd
rename to maven-plugin/tests/episodes/c/src/main/resources/c.xsd
diff --git a/tests/episodes/d/.gitignore b/maven-plugin/tests/episodes/d/.gitignore
similarity index 100%
rename from tests/episodes/d/.gitignore
rename to maven-plugin/tests/episodes/d/.gitignore
diff --git a/tests/episodes/d/pom.xml b/maven-plugin/tests/episodes/d/pom.xml
similarity index 100%
rename from tests/episodes/d/pom.xml
rename to maven-plugin/tests/episodes/d/pom.xml
diff --git a/tests/episodes/d/src/main/resources/catalog.cat b/maven-plugin/tests/episodes/d/src/main/resources/catalog.cat
similarity index 100%
rename from tests/episodes/d/src/main/resources/catalog.cat
rename to maven-plugin/tests/episodes/d/src/main/resources/catalog.cat
diff --git a/tests/episodes/d/src/main/resources/d.xsd b/maven-plugin/tests/episodes/d/src/main/resources/d.xsd
similarity index 100%
rename from tests/episodes/d/src/main/resources/d.xsd
rename to maven-plugin/tests/episodes/d/src/main/resources/d.xsd
diff --git a/tests/episodes/e/.gitignore b/maven-plugin/tests/episodes/e/.gitignore
similarity index 100%
rename from tests/episodes/e/.gitignore
rename to maven-plugin/tests/episodes/e/.gitignore
diff --git a/tests/episodes/e/pom.xml b/maven-plugin/tests/episodes/e/pom.xml
similarity index 100%
rename from tests/episodes/e/pom.xml
rename to maven-plugin/tests/episodes/e/pom.xml
diff --git a/tests/episodes/e/src/main/resources/catalog.cat b/maven-plugin/tests/episodes/e/src/main/resources/catalog.cat
similarity index 100%
rename from tests/episodes/e/src/main/resources/catalog.cat
rename to maven-plugin/tests/episodes/e/src/main/resources/catalog.cat
diff --git a/tests/episodes/e/src/main/resources/d.xsd b/maven-plugin/tests/episodes/e/src/main/resources/d.xsd
similarity index 100%
rename from tests/episodes/e/src/main/resources/d.xsd
rename to maven-plugin/tests/episodes/e/src/main/resources/d.xsd
diff --git a/tests/episodes/pom.xml b/maven-plugin/tests/episodes/pom.xml
similarity index 100%
rename from tests/episodes/pom.xml
rename to maven-plugin/tests/episodes/pom.xml
diff --git a/tests/full-build-1.7.bat b/maven-plugin/tests/full-build-1.7.bat
similarity index 100%
rename from tests/full-build-1.7.bat
rename to maven-plugin/tests/full-build-1.7.bat
diff --git a/tests/full-build-1.8.bat b/maven-plugin/tests/full-build-1.8.bat
similarity index 100%
rename from tests/full-build-1.8.bat
rename to maven-plugin/tests/full-build-1.8.bat
diff --git a/tests/full-build-9.bat b/maven-plugin/tests/full-build-9.bat
similarity index 100%
rename from tests/full-build-9.bat
rename to maven-plugin/tests/full-build-9.bat
diff --git a/tests/gh-issue-16/.gitignore b/maven-plugin/tests/gh-issue-16/.gitignore
similarity index 100%
rename from tests/gh-issue-16/.gitignore
rename to maven-plugin/tests/gh-issue-16/.gitignore
diff --git a/tests/gh-issue-16/pom.xml b/maven-plugin/tests/gh-issue-16/pom.xml
similarity index 100%
rename from tests/gh-issue-16/pom.xml
rename to maven-plugin/tests/gh-issue-16/pom.xml
diff --git a/tests/gh-issue-16/src/main/resources/ab/a.xjb b/maven-plugin/tests/gh-issue-16/src/main/resources/ab/a.xjb
similarity index 100%
rename from tests/gh-issue-16/src/main/resources/ab/a.xjb
rename to maven-plugin/tests/gh-issue-16/src/main/resources/ab/a.xjb
diff --git a/tests/gh-issue-16/src/main/resources/ab/a.xsd b/maven-plugin/tests/gh-issue-16/src/main/resources/ab/a.xsd
similarity index 100%
rename from tests/gh-issue-16/src/main/resources/ab/a.xsd
rename to maven-plugin/tests/gh-issue-16/src/main/resources/ab/a.xsd
diff --git a/tests/gh-issue-16/src/main/resources/ab/b.xsd b/maven-plugin/tests/gh-issue-16/src/main/resources/ab/b.xsd
similarity index 100%
rename from tests/gh-issue-16/src/main/resources/ab/b.xsd
rename to maven-plugin/tests/gh-issue-16/src/main/resources/ab/b.xsd
diff --git a/tests/gh-issue-16/src/main/resources/ab/catalog.cat b/maven-plugin/tests/gh-issue-16/src/main/resources/ab/catalog.cat
similarity index 100%
rename from tests/gh-issue-16/src/main/resources/ab/catalog.cat
rename to maven-plugin/tests/gh-issue-16/src/main/resources/ab/catalog.cat
diff --git a/tests/gh-issue-19/a/.gitignore b/maven-plugin/tests/gh-issue-19/a/.gitignore
similarity index 100%
rename from tests/gh-issue-19/a/.gitignore
rename to maven-plugin/tests/gh-issue-19/a/.gitignore
diff --git a/tests/gh-issue-19/a/pom.xml b/maven-plugin/tests/gh-issue-19/a/pom.xml
similarity index 100%
rename from tests/gh-issue-19/a/pom.xml
rename to maven-plugin/tests/gh-issue-19/a/pom.xml
diff --git a/tests/gh-issue-19/a/src/main/resources/a/a.xsd b/maven-plugin/tests/gh-issue-19/a/src/main/resources/a/a.xsd
similarity index 100%
rename from tests/gh-issue-19/a/src/main/resources/a/a.xsd
rename to maven-plugin/tests/gh-issue-19/a/src/main/resources/a/a.xsd
diff --git a/tests/gh-issue-19/b/.gitignore b/maven-plugin/tests/gh-issue-19/b/.gitignore
similarity index 100%
rename from tests/gh-issue-19/b/.gitignore
rename to maven-plugin/tests/gh-issue-19/b/.gitignore
diff --git a/tests/gh-issue-19/b/pom.xml b/maven-plugin/tests/gh-issue-19/b/pom.xml
similarity index 100%
rename from tests/gh-issue-19/b/pom.xml
rename to maven-plugin/tests/gh-issue-19/b/pom.xml
diff --git a/tests/gh-issue-19/b/src/main/resources/b/b.cat b/maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.cat
similarity index 100%
rename from tests/gh-issue-19/b/src/main/resources/b/b.cat
rename to maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.cat
diff --git a/tests/gh-issue-19/b/src/main/resources/b/b.xsd b/maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.xsd
similarity index 100%
rename from tests/gh-issue-19/b/src/main/resources/b/b.xsd
rename to maven-plugin/tests/gh-issue-19/b/src/main/resources/b/b.xsd
diff --git a/tests/gh-issue-19/pom.xml b/maven-plugin/tests/gh-issue-19/pom.xml
similarity index 100%
rename from tests/gh-issue-19/pom.xml
rename to maven-plugin/tests/gh-issue-19/pom.xml
diff --git a/tests/gh-issue-22/a/.gitignore b/maven-plugin/tests/gh-issue-22/a/.gitignore
similarity index 100%
rename from tests/gh-issue-22/a/.gitignore
rename to maven-plugin/tests/gh-issue-22/a/.gitignore
diff --git a/tests/gh-issue-22/a/pom.xml b/maven-plugin/tests/gh-issue-22/a/pom.xml
similarity index 100%
rename from tests/gh-issue-22/a/pom.xml
rename to maven-plugin/tests/gh-issue-22/a/pom.xml
diff --git a/tests/gh-issue-22/a/src/main/resources/a.xsd b/maven-plugin/tests/gh-issue-22/a/src/main/resources/a.xsd
similarity index 100%
rename from tests/gh-issue-22/a/src/main/resources/a.xsd
rename to maven-plugin/tests/gh-issue-22/a/src/main/resources/a.xsd
diff --git a/tests/gh-issue-22/b/.gitignore b/maven-plugin/tests/gh-issue-22/b/.gitignore
similarity index 100%
rename from tests/gh-issue-22/b/.gitignore
rename to maven-plugin/tests/gh-issue-22/b/.gitignore
diff --git a/tests/gh-issue-22/b/pom.xml b/maven-plugin/tests/gh-issue-22/b/pom.xml
similarity index 100%
rename from tests/gh-issue-22/b/pom.xml
rename to maven-plugin/tests/gh-issue-22/b/pom.xml
diff --git a/tests/gh-issue-22/pom.xml b/maven-plugin/tests/gh-issue-22/pom.xml
similarity index 100%
rename from tests/gh-issue-22/pom.xml
rename to maven-plugin/tests/gh-issue-22/pom.xml
diff --git a/tests/gh-issue-23/one-non-strict/.gitignore b/maven-plugin/tests/gh-issue-23/one-non-strict/.gitignore
similarity index 100%
rename from tests/gh-issue-23/one-non-strict/.gitignore
rename to maven-plugin/tests/gh-issue-23/one-non-strict/.gitignore
diff --git a/tests/gh-issue-23/one-non-strict/pom.xml b/maven-plugin/tests/gh-issue-23/one-non-strict/pom.xml
similarity index 100%
rename from tests/gh-issue-23/one-non-strict/pom.xml
rename to maven-plugin/tests/gh-issue-23/one-non-strict/pom.xml
diff --git a/tests/gh-issue-23/one-non-strict/src/main/resources/META-INF/one/catalog.xml b/maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/META-INF/one/catalog.xml
similarity index 100%
rename from tests/gh-issue-23/one-non-strict/src/main/resources/META-INF/one/catalog.xml
rename to maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/META-INF/one/catalog.xml
diff --git a/tests/gh-issue-23/one-non-strict/src/main/resources/one/a.xsd b/maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/one/a.xsd
similarity index 100%
rename from tests/gh-issue-23/one-non-strict/src/main/resources/one/a.xsd
rename to maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/one/a.xsd
diff --git a/tests/gh-issue-23/one-non-strict/src/main/resources/one/b.xsd b/maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/one/b.xsd
similarity index 100%
rename from tests/gh-issue-23/one-non-strict/src/main/resources/one/b.xsd
rename to maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/one/b.xsd
diff --git a/tests/gh-issue-23/one-non-strict/src/main/resources/one/b1.xsd b/maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/one/b1.xsd
similarity index 100%
rename from tests/gh-issue-23/one-non-strict/src/main/resources/one/b1.xsd
rename to maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/one/b1.xsd
diff --git a/tests/gh-issue-23/one-non-strict/src/main/resources/two/p.xsd b/maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/two/p.xsd
similarity index 100%
rename from tests/gh-issue-23/one-non-strict/src/main/resources/two/p.xsd
rename to maven-plugin/tests/gh-issue-23/one-non-strict/src/main/resources/two/p.xsd
diff --git a/tests/gh-issue-23/pom.xml b/maven-plugin/tests/gh-issue-23/pom.xml
similarity index 100%
rename from tests/gh-issue-23/pom.xml
rename to maven-plugin/tests/gh-issue-23/pom.xml
diff --git a/tests/gh-issue-23/two-non-strict/.gitignore b/maven-plugin/tests/gh-issue-23/two-non-strict/.gitignore
similarity index 100%
rename from tests/gh-issue-23/two-non-strict/.gitignore
rename to maven-plugin/tests/gh-issue-23/two-non-strict/.gitignore
diff --git a/tests/gh-issue-23/two-non-strict/pom.xml b/maven-plugin/tests/gh-issue-23/two-non-strict/pom.xml
similarity index 100%
rename from tests/gh-issue-23/two-non-strict/pom.xml
rename to maven-plugin/tests/gh-issue-23/two-non-strict/pom.xml
diff --git a/tests/gh-issue-23/two-non-strict/src/main/resources/META-INF/two/catalog.xml b/maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/META-INF/two/catalog.xml
similarity index 100%
rename from tests/gh-issue-23/two-non-strict/src/main/resources/META-INF/two/catalog.xml
rename to maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/META-INF/two/catalog.xml
diff --git a/tests/gh-issue-23/two-non-strict/src/main/resources/one/a.xsd b/maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/one/a.xsd
similarity index 100%
rename from tests/gh-issue-23/two-non-strict/src/main/resources/one/a.xsd
rename to maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/one/a.xsd
diff --git a/tests/gh-issue-23/two-non-strict/src/main/resources/one/b.xsd b/maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/one/b.xsd
similarity index 100%
rename from tests/gh-issue-23/two-non-strict/src/main/resources/one/b.xsd
rename to maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/one/b.xsd
diff --git a/tests/gh-issue-23/two-non-strict/src/main/resources/one/b1.xsd b/maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/one/b1.xsd
similarity index 100%
rename from tests/gh-issue-23/two-non-strict/src/main/resources/one/b1.xsd
rename to maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/one/b1.xsd
diff --git a/tests/gh-issue-23/two-non-strict/src/main/resources/two/p.xsd b/maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/two/p.xsd
similarity index 100%
rename from tests/gh-issue-23/two-non-strict/src/main/resources/two/p.xsd
rename to maven-plugin/tests/gh-issue-23/two-non-strict/src/main/resources/two/p.xsd
diff --git a/tests/gh-issue-58/.gitignore b/maven-plugin/tests/gh-issue-58/.gitignore
similarity index 100%
rename from tests/gh-issue-58/.gitignore
rename to maven-plugin/tests/gh-issue-58/.gitignore
diff --git a/tests/gh-issue-58/pom.xml b/maven-plugin/tests/gh-issue-58/pom.xml
similarity index 100%
rename from tests/gh-issue-58/pom.xml
rename to maven-plugin/tests/gh-issue-58/pom.xml
diff --git a/tests/gh-issue-58/src/main/resources/purchaseorder.xsd b/maven-plugin/tests/gh-issue-58/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from tests/gh-issue-58/src/main/resources/purchaseorder.xsd
rename to maven-plugin/tests/gh-issue-58/src/main/resources/purchaseorder.xsd
diff --git a/tests/issues/.gitignore b/maven-plugin/tests/issues/.gitignore
similarity index 100%
rename from tests/issues/.gitignore
rename to maven-plugin/tests/issues/.gitignore
diff --git a/tests/issues/pom.xml b/maven-plugin/tests/issues/pom.xml
similarity index 100%
rename from tests/issues/pom.xml
rename to maven-plugin/tests/issues/pom.xml
diff --git a/tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java b/maven-plugin/tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java
similarity index 100%
rename from tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java
rename to maven-plugin/tests/issues/src/main/java/org/jvnet/jaxb/maven/tests/issues/common/Generated.java
diff --git a/tests/issues/src/main/resources/binding.xjb b/maven-plugin/tests/issues/src/main/resources/binding.xjb
similarity index 100%
rename from tests/issues/src/main/resources/binding.xjb
rename to maven-plugin/tests/issues/src/main/resources/binding.xjb
diff --git a/tests/issues/src/main/resources/depends.dep b/maven-plugin/tests/issues/src/main/resources/depends.dep
similarity index 100%
rename from tests/issues/src/main/resources/depends.dep
rename to maven-plugin/tests/issues/src/main/resources/depends.dep
diff --git a/tests/issues/src/main/resources/depends.txt b/maven-plugin/tests/issues/src/main/resources/depends.txt
similarity index 100%
rename from tests/issues/src/main/resources/depends.txt
rename to maven-plugin/tests/issues/src/main/resources/depends.txt
diff --git a/tests/issues/src/main/resources/schema.xsd b/maven-plugin/tests/issues/src/main/resources/schema.xsd
similarity index 100%
rename from tests/issues/src/main/resources/schema.xsd
rename to maven-plugin/tests/issues/src/main/resources/schema.xsd
diff --git a/tests/issues/src/test/resources/log4j.properties b/maven-plugin/tests/issues/src/test/resources/log4j.properties
similarity index 100%
rename from tests/issues/src/test/resources/log4j.properties
rename to maven-plugin/tests/issues/src/test/resources/log4j.properties
diff --git a/tests/java-9/.gitignore b/maven-plugin/tests/java-9/.gitignore
similarity index 100%
rename from tests/java-9/.gitignore
rename to maven-plugin/tests/java-9/.gitignore
diff --git a/tests/java-9/install-10.bat b/maven-plugin/tests/java-9/install-10.bat
similarity index 100%
rename from tests/java-9/install-10.bat
rename to maven-plugin/tests/java-9/install-10.bat
diff --git a/tests/java-9/install-8.bat b/maven-plugin/tests/java-9/install-8.bat
similarity index 100%
rename from tests/java-9/install-8.bat
rename to maven-plugin/tests/java-9/install-8.bat
diff --git a/tests/java-9/install-9.bat b/maven-plugin/tests/java-9/install-9.bat
similarity index 100%
rename from tests/java-9/install-9.bat
rename to maven-plugin/tests/java-9/install-9.bat
diff --git a/tests/java-9/pom.xml b/maven-plugin/tests/java-9/pom.xml
similarity index 100%
rename from tests/java-9/pom.xml
rename to maven-plugin/tests/java-9/pom.xml
diff --git a/tests/java-9/src/main/resources/SimpleClass.xsd b/maven-plugin/tests/java-9/src/main/resources/SimpleClass.xsd
similarity index 100%
rename from tests/java-9/src/main/resources/SimpleClass.xsd
rename to maven-plugin/tests/java-9/src/main/resources/SimpleClass.xsd
diff --git a/tests/java-9/src/main/resources/SimpleClassWithOtherName.xsd b/maven-plugin/tests/java-9/src/main/resources/SimpleClassWithOtherName.xsd
similarity index 100%
rename from tests/java-9/src/main/resources/SimpleClassWithOtherName.xsd
rename to maven-plugin/tests/java-9/src/main/resources/SimpleClassWithOtherName.xsd
diff --git a/tests/java-9/src/main/resources/SimpleClassWithPackage.xsd b/maven-plugin/tests/java-9/src/main/resources/SimpleClassWithPackage.xsd
similarity index 100%
rename from tests/java-9/src/main/resources/SimpleClassWithPackage.xsd
rename to maven-plugin/tests/java-9/src/main/resources/SimpleClassWithPackage.xsd
diff --git a/tests/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java b/maven-plugin/tests/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java
similarity index 100%
rename from tests/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java
rename to maven-plugin/tests/java-9/src/test/java/org/jvnet/jaxb/maven/java9/Java9Test.java
diff --git a/tests/p_o/.gitignore b/maven-plugin/tests/p_o/.gitignore
similarity index 100%
rename from tests/p_o/.gitignore
rename to maven-plugin/tests/p_o/.gitignore
diff --git a/tests/p_o/pom.xml b/maven-plugin/tests/p_o/pom.xml
similarity index 100%
rename from tests/p_o/pom.xml
rename to maven-plugin/tests/p_o/pom.xml
diff --git a/tests/p_o/src/main/resources/binding.xjb b/maven-plugin/tests/p_o/src/main/resources/binding.xjb
similarity index 100%
rename from tests/p_o/src/main/resources/binding.xjb
rename to maven-plugin/tests/p_o/src/main/resources/binding.xjb
diff --git a/tests/p_o/src/main/resources/purchaseorder.xsd b/maven-plugin/tests/p_o/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from tests/p_o/src/main/resources/purchaseorder.xsd
rename to maven-plugin/tests/p_o/src/main/resources/purchaseorder.xsd
diff --git a/tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java b/maven-plugin/tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java
similarity index 100%
rename from tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java
rename to maven-plugin/tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunP_OPlugin.java
diff --git a/tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java b/maven-plugin/tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java
similarity index 100%
rename from tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java
rename to maven-plugin/tests/p_o/src/test/java/org/jvnet/mjiip/tests/p_o/RunXJC.java
diff --git a/tests/po-2.3/.gitignore b/maven-plugin/tests/po-2.3/.gitignore
similarity index 100%
rename from tests/po-2.3/.gitignore
rename to maven-plugin/tests/po-2.3/.gitignore
diff --git a/tests/po-2.3/pom.xml b/maven-plugin/tests/po-2.3/pom.xml
similarity index 100%
rename from tests/po-2.3/pom.xml
rename to maven-plugin/tests/po-2.3/pom.xml
diff --git a/tests/po-2.3/src/main/resources/purchaseorder.xsd b/maven-plugin/tests/po-2.3/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from tests/po-2.3/src/main/resources/purchaseorder.xsd
rename to maven-plugin/tests/po-2.3/src/main/resources/purchaseorder.xsd
diff --git a/tests/po-scd/.gitignore b/maven-plugin/tests/po-scd/.gitignore
similarity index 100%
rename from tests/po-scd/.gitignore
rename to maven-plugin/tests/po-scd/.gitignore
diff --git a/tests/po-scd/build-1.5.bat b/maven-plugin/tests/po-scd/build-1.5.bat
similarity index 100%
rename from tests/po-scd/build-1.5.bat
rename to maven-plugin/tests/po-scd/build-1.5.bat
diff --git a/tests/po-scd/build-1.6.bat b/maven-plugin/tests/po-scd/build-1.6.bat
similarity index 100%
rename from tests/po-scd/build-1.6.bat
rename to maven-plugin/tests/po-scd/build-1.6.bat
diff --git a/tests/po-scd/pom.xml b/maven-plugin/tests/po-scd/pom.xml
similarity index 100%
rename from tests/po-scd/pom.xml
rename to maven-plugin/tests/po-scd/pom.xml
diff --git a/tests/po-scd/src/main/resources/bindings.xjb b/maven-plugin/tests/po-scd/src/main/resources/bindings.xjb
similarity index 100%
rename from tests/po-scd/src/main/resources/bindings.xjb
rename to maven-plugin/tests/po-scd/src/main/resources/bindings.xjb
diff --git a/tests/po-scd/src/main/resources/purchaseorder.xsd b/maven-plugin/tests/po-scd/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from tests/po-scd/src/main/resources/purchaseorder.xsd
rename to maven-plugin/tests/po-scd/src/main/resources/purchaseorder.xsd
diff --git a/tests/pom.xml b/maven-plugin/tests/pom.xml
similarity index 100%
rename from tests/pom.xml
rename to maven-plugin/tests/pom.xml
diff --git a/tests/res/.gitignore b/maven-plugin/tests/res/.gitignore
similarity index 100%
rename from tests/res/.gitignore
rename to maven-plugin/tests/res/.gitignore
diff --git a/tests/res/pom.xml b/maven-plugin/tests/res/pom.xml
similarity index 100%
rename from tests/res/pom.xml
rename to maven-plugin/tests/res/pom.xml
diff --git a/tests/res/src/main/resources/bindings.xjb b/maven-plugin/tests/res/src/main/resources/bindings.xjb
similarity index 100%
rename from tests/res/src/main/resources/bindings.xjb
rename to maven-plugin/tests/res/src/main/resources/bindings.xjb
diff --git a/tests/res/src/main/resources/catalog.cat b/maven-plugin/tests/res/src/main/resources/catalog.cat
similarity index 100%
rename from tests/res/src/main/resources/catalog.cat
rename to maven-plugin/tests/res/src/main/resources/catalog.cat
diff --git a/tests/res/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd b/maven-plugin/tests/res/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd
similarity index 100%
rename from tests/res/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd
rename to maven-plugin/tests/res/src/main/schema/ogc/wms/1.3.0/exceptions_1_3_0.xsd
diff --git a/tests/res/src/main/schemas/schema.xs b/maven-plugin/tests/res/src/main/schemas/schema.xs
similarity index 100%
rename from tests/res/src/main/schemas/schema.xs
rename to maven-plugin/tests/res/src/main/schemas/schema.xs
diff --git a/tests/res/src/main/schemas/schema.xsd b/maven-plugin/tests/res/src/main/schemas/schema.xsd
similarity index 100%
rename from tests/res/src/main/schemas/schema.xsd
rename to maven-plugin/tests/res/src/main/schemas/schema.xsd
diff --git a/tests/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java b/maven-plugin/tests/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java
similarity index 100%
rename from tests/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java
rename to maven-plugin/tests/res/src/test/java/org/jvnet/jaxb/maven/tests/res/RunResMojo.java
diff --git a/tests/rnc/.gitignore b/maven-plugin/tests/rnc/.gitignore
similarity index 100%
rename from tests/rnc/.gitignore
rename to maven-plugin/tests/rnc/.gitignore
diff --git a/tests/rnc/pom.xml b/maven-plugin/tests/rnc/pom.xml
similarity index 100%
rename from tests/rnc/pom.xml
rename to maven-plugin/tests/rnc/pom.xml
diff --git a/tests/rnc/src/main/resources/georss.rnc b/maven-plugin/tests/rnc/src/main/resources/georss.rnc
similarity index 100%
rename from tests/rnc/src/main/resources/georss.rnc
rename to maven-plugin/tests/rnc/src/main/resources/georss.rnc
diff --git a/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java b/maven-plugin/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java
similarity index 100%
rename from tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java
rename to maven-plugin/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/DatatypeLibraryLoaderTest.java
diff --git a/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java b/maven-plugin/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java
similarity index 100%
rename from tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java
rename to maven-plugin/tests/rnc/src/test/java/org/jvnet/jaxb/maven/tests/rnc/RunRNCMojo.java
diff --git a/tests/tse/.gitignore b/maven-plugin/tests/tse/.gitignore
similarity index 100%
rename from tests/tse/.gitignore
rename to maven-plugin/tests/tse/.gitignore
diff --git a/tests/tse/pom.xml b/maven-plugin/tests/tse/pom.xml
similarity index 100%
rename from tests/tse/pom.xml
rename to maven-plugin/tests/tse/pom.xml
diff --git a/tests/tse/src/main/java/a/A2Enum.java b/maven-plugin/tests/tse/src/main/java/a/A2Enum.java
similarity index 100%
rename from tests/tse/src/main/java/a/A2Enum.java
rename to maven-plugin/tests/tse/src/main/java/a/A2Enum.java
diff --git a/tests/tse/src/main/java/a/ObjectFactory.java b/maven-plugin/tests/tse/src/main/java/a/ObjectFactory.java
similarity index 100%
rename from tests/tse/src/main/java/a/ObjectFactory.java
rename to maven-plugin/tests/tse/src/main/java/a/ObjectFactory.java
diff --git a/tests/tse/src/main/resources/a.xsd b/maven-plugin/tests/tse/src/main/resources/a.xsd
similarity index 100%
rename from tests/tse/src/main/resources/a.xsd
rename to maven-plugin/tests/tse/src/main/resources/a.xsd
diff --git a/tests/tse/src/main/resources/b.xsd b/maven-plugin/tests/tse/src/main/resources/b.xsd
similarity index 100%
rename from tests/tse/src/main/resources/b.xsd
rename to maven-plugin/tests/tse/src/main/resources/b.xsd
diff --git a/tests/two/.gitignore b/maven-plugin/tests/two/.gitignore
similarity index 100%
rename from tests/two/.gitignore
rename to maven-plugin/tests/two/.gitignore
diff --git a/tests/two/build-1.5.bat b/maven-plugin/tests/two/build-1.5.bat
similarity index 100%
rename from tests/two/build-1.5.bat
rename to maven-plugin/tests/two/build-1.5.bat
diff --git a/tests/two/build-1.6.bat b/maven-plugin/tests/two/build-1.6.bat
similarity index 100%
rename from tests/two/build-1.6.bat
rename to maven-plugin/tests/two/build-1.6.bat
diff --git a/tests/two/pom.xml b/maven-plugin/tests/two/pom.xml
similarity index 100%
rename from tests/two/pom.xml
rename to maven-plugin/tests/two/pom.xml
diff --git a/tests/two/src/main/resources/schema.xs b/maven-plugin/tests/two/src/main/resources/schema.xs
similarity index 100%
rename from tests/two/src/main/resources/schema.xs
rename to maven-plugin/tests/two/src/main/resources/schema.xs
diff --git a/tests/two/src/main/resources/schema.xsd b/maven-plugin/tests/two/src/main/resources/schema.xsd
similarity index 100%
rename from tests/two/src/main/resources/schema.xsd
rename to maven-plugin/tests/two/src/main/resources/schema.xsd
diff --git a/tests/two/src/test/resources/log4j.properties b/maven-plugin/tests/two/src/test/resources/log4j.properties
similarity index 100%
rename from tests/two/src/test/resources/log4j.properties
rename to maven-plugin/tests/two/src/test/resources/log4j.properties
diff --git a/tests/two/src/test/samples/1.xml b/maven-plugin/tests/two/src/test/samples/1.xml
similarity index 100%
rename from tests/two/src/test/samples/1.xml
rename to maven-plugin/tests/two/src/test/samples/1.xml
diff --git a/tests/wsdl-file/.gitignore b/maven-plugin/tests/wsdl-file/.gitignore
similarity index 100%
rename from tests/wsdl-file/.gitignore
rename to maven-plugin/tests/wsdl-file/.gitignore
diff --git a/tests/wsdl-file/build-1.5.bat b/maven-plugin/tests/wsdl-file/build-1.5.bat
similarity index 100%
rename from tests/wsdl-file/build-1.5.bat
rename to maven-plugin/tests/wsdl-file/build-1.5.bat
diff --git a/tests/wsdl-file/build-1.6.bat b/maven-plugin/tests/wsdl-file/build-1.6.bat
similarity index 100%
rename from tests/wsdl-file/build-1.6.bat
rename to maven-plugin/tests/wsdl-file/build-1.6.bat
diff --git a/tests/wsdl-file/pom.xml b/maven-plugin/tests/wsdl-file/pom.xml
similarity index 100%
rename from tests/wsdl-file/pom.xml
rename to maven-plugin/tests/wsdl-file/pom.xml
diff --git a/tests/wsdl-file/src/main/resources/pedidowebservice.wsdl b/maven-plugin/tests/wsdl-file/src/main/resources/pedidowebservice.wsdl
similarity index 100%
rename from tests/wsdl-file/src/main/resources/pedidowebservice.wsdl
rename to maven-plugin/tests/wsdl-file/src/main/resources/pedidowebservice.wsdl
diff --git a/tests/wsdl-file/src/test/java/net/webservicex/test/JAXBContextTest.java b/maven-plugin/tests/wsdl-file/src/test/java/net/webservicex/test/JAXBContextTest.java
similarity index 100%
rename from tests/wsdl-file/src/test/java/net/webservicex/test/JAXBContextTest.java
rename to maven-plugin/tests/wsdl-file/src/test/java/net/webservicex/test/JAXBContextTest.java
diff --git a/tests/wsdl/.gitignore b/maven-plugin/tests/wsdl/.gitignore
similarity index 100%
rename from tests/wsdl/.gitignore
rename to maven-plugin/tests/wsdl/.gitignore
diff --git a/tests/wsdl/build-1.5.bat b/maven-plugin/tests/wsdl/build-1.5.bat
similarity index 100%
rename from tests/wsdl/build-1.5.bat
rename to maven-plugin/tests/wsdl/build-1.5.bat
diff --git a/tests/wsdl/build-1.6.bat b/maven-plugin/tests/wsdl/build-1.6.bat
similarity index 100%
rename from tests/wsdl/build-1.6.bat
rename to maven-plugin/tests/wsdl/build-1.6.bat
diff --git a/tests/wsdl/pom.xml b/maven-plugin/tests/wsdl/pom.xml
similarity index 100%
rename from tests/wsdl/pom.xml
rename to maven-plugin/tests/wsdl/pom.xml
diff --git a/tests/wsdl/src/test/java/net/webservicex/test/JAXBContextTest.java b/maven-plugin/tests/wsdl/src/test/java/net/webservicex/test/JAXBContextTest.java
similarity index 100%
rename from tests/wsdl/src/test/java/net/webservicex/test/JAXBContextTest.java
rename to maven-plugin/tests/wsdl/src/test/java/net/webservicex/test/JAXBContextTest.java
diff --git a/tests/xjc-simple/.gitignore b/maven-plugin/tests/xjc-simple/.gitignore
similarity index 100%
rename from tests/xjc-simple/.gitignore
rename to maven-plugin/tests/xjc-simple/.gitignore
diff --git a/tests/xjc-simple/pom.xml b/maven-plugin/tests/xjc-simple/pom.xml
similarity index 100%
rename from tests/xjc-simple/pom.xml
rename to maven-plugin/tests/xjc-simple/pom.xml
diff --git a/tests/xjc-simple/src/main/resources/purchaseorder.xjb b/maven-plugin/tests/xjc-simple/src/main/resources/purchaseorder.xjb
similarity index 100%
rename from tests/xjc-simple/src/main/resources/purchaseorder.xjb
rename to maven-plugin/tests/xjc-simple/src/main/resources/purchaseorder.xjb
diff --git a/tests/xjc-simple/src/main/resources/purchaseorder.xsd b/maven-plugin/tests/xjc-simple/src/main/resources/purchaseorder.xsd
similarity index 100%
rename from tests/xjc-simple/src/main/resources/purchaseorder.xsd
rename to maven-plugin/tests/xjc-simple/src/main/resources/purchaseorder.xsd
diff --git a/www/alm-process/snippets/page.xml b/maven-plugin/www/alm-process/snippets/page.xml
similarity index 100%
rename from www/alm-process/snippets/page.xml
rename to maven-plugin/www/alm-process/snippets/page.xml
diff --git a/www/docs/guide.html b/maven-plugin/www/docs/guide.html
similarity index 100%
rename from www/docs/guide.html
rename to maven-plugin/www/docs/guide.html
diff --git a/www/index.html b/maven-plugin/www/index.html
similarity index 100%
rename from www/index.html
rename to maven-plugin/www/index.html
diff --git a/www/project_tools.html b/maven-plugin/www/project_tools.html
similarity index 100%
rename from www/project_tools.html
rename to maven-plugin/www/project_tools.html
diff --git a/pom.xml b/pom.xml
index ea25bde93..a4b26686b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jvnet.jaxb</groupId>
-	<artifactId>jaxb-maven-plugin-project</artifactId>
+	<artifactId>jaxb-tools-project</artifactId>
 	<version>2.0.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Maven JAXB Plugin Project</name>
-	<description>Maven plugin for JAXB XJC compiler to generate Java sources from XML Schemas.</description>
-	<url>https://github.com/highsource/jaxb-maven-plugin</url>
+	<name>JAXB Tools :: Project</name>
+	<description>JAXB tools work with generate Java sources and XML Schemas.</description>
+	<url>https://github.com/highsource/jaxb-tools</url>
 	<licenses>
 		<license>
 			<name>BSD-Style License</name>
-			<url>https://github.com/highsource/maven-jaxb2-plugin/blob/master/LICENSE</url>
+			<url>https://github.com/highsource/jaxb-tools/blob/master/LICENSE</url>
 			<distribution>repo</distribution>
-			<comments>Maven JAXB Plugin license is the 3-clause BSD license which is compatible with GPL. Maven JAXB2 Plugin license does not require you to include any acknowledgments for Maven JAXB2 Plugin in advertising materials for your software.</comments>
+			<comments>JAXB Tools license is the 3-clause BSD license which is compatible with GPL. JAXB Tools license does not require you to include any acknowledgments for JAXB Tools in advertising materials for your software.</comments>
 		</license>
 	</licenses>
 	<inceptionYear>2006</inceptionYear>
   <scm>
-    <connection>scm:git:https://github.com/highsource/maven-jaxb2-plugin.git</connection>
-    <url>https://github.com/highsource/maven-jaxb2-plugin</url>
+    <connection>scm:git:https://github.com/highsource/jaxb-tools.git</connection>
+    <url>https://github.com/highsource/jaxb-tools</url>
     <tag>${project.version}</tag>
 	</scm>
 	<developers>
@@ -40,9 +40,7 @@
     </developer>
 	</developers>
 	<modules>
-		<module>plugin-core</module>
-		<module>plugin</module>
-		<module>testing</module>
+                <module>maven-plugin</module>
 	</modules>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,42 +60,6 @@
 		<slf4j.version>1.7.25</slf4j.version>
 	</properties>
 	<profiles>
-		<profile>
-			<id>samples</id>
-			<activation>
-				<property>
-					<name>samples</name>
-				</property>
-			</activation>
-			<modules>
-				<module>samples</module>
-				<module>dist</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>tests</id>
-			<activation>
-				<property>
-					<name>tests</name>
-				</property>
-			</activation>
-			<modules>
-				<module>tests</module>
-			</modules>
-		</profile>
-		<profile>
-			<id>all</id>
-			<activation>
-				<property>
-					<name>all</name>
-				</property>
-			</activation>
-			<modules>
-				<module>dist</module>
-				<module>samples</module>
-				<module>tests</module>
-			</modules>
-		</profile>
 		<profile>
 			<id>sonatype-oss-release</id>
 			<build>