diff --git a/basics/basic/pom.xml b/basics/basic/pom.xml
index 3f22d8ae8..f4b083c62 100644
--- a/basics/basic/pom.xml
+++ b/basics/basic/pom.xml
@@ -11,7 +11,7 @@
   <dependencies>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
@@ -48,7 +48,7 @@
       <build>
         <pluginManagement>
           <plugins>
-						<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
             <plugin>
               <groupId>org.eclipse.m2e</groupId>
               <artifactId>lifecycle-mapping</artifactId>
diff --git a/basics/runtime/pom.xml b/basics/jaxb-plugins-runtime/pom.xml
similarity index 95%
rename from basics/runtime/pom.xml
rename to basics/jaxb-plugins-runtime/pom.xml
index 6182a9acf..36aa0ea99 100644
--- a/basics/runtime/pom.xml
+++ b/basics/jaxb-plugins-runtime/pom.xml
@@ -1,8 +1,8 @@
 <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>
-  <artifactId>jaxb2-basics-runtime</artifactId>
+  <artifactId>jaxb-plugins-runtime</artifactId>
   <packaging>jar</packaging>
-  <name>JAXB Tools :: JAXB Basics :: Runtime</name>
+  <name>JAXB Tools :: Plugins :: Runtime</name>
   <parent>
     <groupId>org.jvnet.jaxb</groupId>
     <artifactId>jaxb-basics-project</artifactId>
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java
diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java b/basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java
similarity index 100%
rename from basics/runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java
rename to basics/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java
diff --git a/basics/runtime/src/main/resources/org/jvnet/jaxb2_commons/locator/messages.properties b/basics/jaxb-plugins-runtime/src/main/resources/org/jvnet/jaxb2_commons/locator/messages.properties
similarity index 100%
rename from basics/runtime/src/main/resources/org/jvnet/jaxb2_commons/locator/messages.properties
rename to basics/jaxb-plugins-runtime/src/main/resources/org/jvnet/jaxb2_commons/locator/messages.properties
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/DynamicSchemaTest.java
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/addelement/AddElementTest.java
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dog.java
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogTest.java
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogType.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogType.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogType.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/DogType.java
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/Dogs.java
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dogs/ObjectFactory.java
diff --git a/basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/hisrc/xml/bind/tests/dynamicelementname/DynamicElementNameTest.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java b/basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java
similarity index 100%
rename from basics/runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java
rename to basics/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java
diff --git a/basics/runtime/src/test/resources/org/hisrc/xml/bind/tests/addelement/element.xml b/basics/jaxb-plugins-runtime/src/test/resources/org/hisrc/xml/bind/tests/addelement/element.xml
similarity index 100%
rename from basics/runtime/src/test/resources/org/hisrc/xml/bind/tests/addelement/element.xml
rename to basics/jaxb-plugins-runtime/src/test/resources/org/hisrc/xml/bind/tests/addelement/element.xml
diff --git a/basics/runtime/src/test/resources/org/hisrc/xml/bind/tests/dogs/dogs.xml b/basics/jaxb-plugins-runtime/src/test/resources/org/hisrc/xml/bind/tests/dogs/dogs.xml
similarity index 100%
rename from basics/runtime/src/test/resources/org/hisrc/xml/bind/tests/dogs/dogs.xml
rename to basics/jaxb-plugins-runtime/src/test/resources/org/hisrc/xml/bind/tests/dogs/dogs.xml
diff --git a/basics/runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml b/basics/jaxb-plugins-runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml
similarity index 100%
rename from basics/runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml
rename to basics/jaxb-plugins-runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml
diff --git a/basics/jaxb-plugins-shaded/pom.xml b/basics/jaxb-plugins-shaded/pom.xml
index ee9e07d1e..cd8db2490 100644
--- a/basics/jaxb-plugins-shaded/pom.xml
+++ b/basics/jaxb-plugins-shaded/pom.xml
@@ -15,7 +15,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
diff --git a/basics/jaxb-plugins-testing/pom.xml b/basics/jaxb-plugins-testing/pom.xml
index b0d8748c8..8d560651b 100644
--- a/basics/jaxb-plugins-testing/pom.xml
+++ b/basics/jaxb-plugins-testing/pom.xml
@@ -29,7 +29,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.xml.bind</groupId>
diff --git a/basics/pom.xml b/basics/pom.xml
index d9466f4ff..7436438ef 100644
--- a/basics/pom.xml
+++ b/basics/pom.xml
@@ -12,7 +12,7 @@
   <description>JAXB Basics is a part of JAXB Tools project which implements plugins and tools for JAXB implementation.</description>
   <modules>
     <module>jaxb-plugins-ant</module>
-    <module>runtime</module>
+    <module>jaxb-plugins-runtime</module>
     <module>tools</module>
     <module>jaxb-plugins-testing</module>
     <module>basic</module>
diff --git a/basics/samples/basic/project-build.xml b/basics/samples/basic/project-build.xml
index 349545de4..0f2417ea9 100644
--- a/basics/samples/basic/project-build.xml
+++ b/basics/samples/basic/project-build.xml
@@ -7,7 +7,7 @@
       <include name="codemodel-*.jar"/>
       <include name="istack-commons-*.jar"/>
       <include name="jakarta.xml.bind-api-*.jar"/>
-      <include name="jaxb2-basics-runtime-*.jar"/>
+      <include name="jaxb-plugins-runtime-*.jar"/>
       <include name="junit-*.jar"/>
       <include name="relaxng-datatype-*.jar"/>
       <include name="rngom-*.jar"/>
@@ -24,7 +24,7 @@
       <include name="jaxb-core-*.jar"/>
       <include name="stax-api-*.jar"/>
       <include name="jsr173_api-*.jar"/>
-      <include name="jaxb2-basics-runtime-*.jar"/>
+      <include name="jaxb-plugins-runtime-*.jar"/>
       <include name="junit-*.jar"/>
       <include name="jaxb-plugins-testing-*.jar"/>
       <include name="xmlunit-*.jar"/>
@@ -48,7 +48,7 @@
       <include name="jaxb-core-*.jar"/>
       <include name="stax-api-*.jar"/>
       <include name="jsr173_api-*.jar"/>
-      <include name="jaxb2-basics-runtime-*.jar"/>
+      <include name="jaxb-plugins-runtime-*.jar"/>
       <include name="junit-*.jar"/>
       <include name="jaxb-plugins-testing-*.jar"/>
       <include name="xmlunit-*.jar"/>
diff --git a/basics/samples/basic/project-pom.xml b/basics/samples/basic/project-pom.xml
index 30f107d23..17f8cb072 100644
--- a/basics/samples/basic/project-pom.xml
+++ b/basics/samples/basic/project-pom.xml
@@ -31,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/basics/samples/cxf/project-pom.xml b/basics/samples/cxf/project-pom.xml
index 3c5ca0c3d..bb6bfb67c 100644
--- a/basics/samples/cxf/project-pom.xml
+++ b/basics/samples/cxf/project-pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/basics/samples/po-simple/project-build.xml b/basics/samples/po-simple/project-build.xml
index 419e046b5..b159c4bc1 100644
--- a/basics/samples/po-simple/project-build.xml
+++ b/basics/samples/po-simple/project-build.xml
@@ -7,7 +7,7 @@
       <include name="codemodel-*.jar"/>
       <include name="istack-commons-*.jar"/>
       <include name="jakarta.xml.bind-api-*.jar"/>
-      <include name="jaxb2-basics-runtime-*.jar"/>
+      <include name="jaxb-plugins-runtime-*.jar"/>
       <include name="relaxng-datatype-*.jar"/>
       <include name="rngom-*.jar"/>
       <include name="txw2-*.jar"/>
@@ -28,7 +28,7 @@
       <include name="rngom-*.jar"/>
       <include name="txw2-*.jar"/>
       <include name="xsom-*.jar"/>
-      <!--include name="jaxb2-basics-runtime-*.jar"/-->
+      <!--include name="jaxb-plugins-runtime-*.jar"/-->
       <include name="junit-*.jar"/>
       <include name="jaxb-plugins-testing-*.jar"/>
       <include name="xmlunit-*.jar"/>
@@ -48,7 +48,7 @@
       <include name="jaxb-core-*.jar"/>
       <include name="stax-api-*.jar"/>
       <include name="jsr173_api-*.jar"/>
-      <!--include name="jaxb2-basics-runtime-*.jar"/-->
+      <!--include name="jaxb-plugins-runtime-*.jar"/-->
       <include name="junit-*.jar"/>
       <include name="jaxb-plugins-testing-*.jar"/>
       <include name="xmlunit-*.jar"/>
diff --git a/basics/samples/po/project-build.xml b/basics/samples/po/project-build.xml
index 2bbaa83b7..8313f1caf 100644
--- a/basics/samples/po/project-build.xml
+++ b/basics/samples/po/project-build.xml
@@ -7,7 +7,7 @@
       <include name="codemodel-*.jar"/>
       <include name="istack-commons-*.jar"/>
       <include name="jakarta.xml.bind-api-*.jar"/>
-      <include name="jaxb2-basics-runtime-*.jar"/>
+      <include name="jaxb-plugins-runtime-*.jar"/>
       <include name="relaxng-datatype-*.jar"/>
       <include name="rngom-*.jar"/>
       <include name="txw2-*.jar"/>
@@ -23,7 +23,7 @@
       <include name="jaxb-core-*.jar"/>
       <include name="stax-api-*.jar"/>
       <include name="jsr173_api-*.jar"/>
-      <include name="jaxb2-basics-runtime-*.jar"/>
+      <include name="jaxb-plugins-runtime-*.jar"/>
       <include name="junit-*.jar"/>
       <include name="jaxb-plugins-testing-*.jar"/>
       <include name="xmlunit-*.jar"/>
@@ -47,7 +47,7 @@
       <include name="jaxb-core-*.jar"/>
       <include name="stax-api-*.jar"/>
       <include name="jsr173_api-*.jar"/>
-      <include name="jaxb2-basics-runtime-*.jar"/>
+      <include name="jaxb-plugins-runtime-*.jar"/>
       <include name="junit-*.jar"/>
       <include name="jaxb-plugins-testing-*.jar"/>
       <include name="xmlunit-*.jar"/>
diff --git a/basics/samples/po/project-pom.xml b/basics/samples/po/project-pom.xml
index bce445d53..0c8a570b4 100644
--- a/basics/samples/po/project-pom.xml
+++ b/basics/samples/po/project-pom.xml
@@ -31,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/basics/tests/defaultvalue/pom.xml b/basics/tests/defaultvalue/pom.xml
index 4fe926c66..3e33f835c 100644
--- a/basics/tests/defaultvalue/pom.xml
+++ b/basics/tests/defaultvalue/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/basics/tests/namespace/pom.xml b/basics/tests/namespace/pom.xml
index 89ac79f7b..fb32dc263 100644
--- a/basics/tests/namespace/pom.xml
+++ b/basics/tests/namespace/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/basics/tests/po/pom.xml b/basics/tests/po/pom.xml
index b27c1d942..b3b749d44 100644
--- a/basics/tests/po/pom.xml
+++ b/basics/tests/po/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/basics/tests/pom.xml b/basics/tests/pom.xml
index 4ed70a29e..daf043e0b 100644
--- a/basics/tests/pom.xml
+++ b/basics/tests/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>com.sun.activation</groupId>
diff --git a/basics/tests/qa-simple/pom.xml b/basics/tests/qa-simple/pom.xml
index c0bf53beb..1e1d1ee0c 100644
--- a/basics/tests/qa-simple/pom.xml
+++ b/basics/tests/qa-simple/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/basics/tests/qa-strategic/pom.xml b/basics/tests/qa-strategic/pom.xml
index f3eef46fb..8f0bcd230 100644
--- a/basics/tests/qa-strategic/pom.xml
+++ b/basics/tests/qa-strategic/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/basics/tools/pom.xml b/basics/tools/pom.xml
index 6f5d8eff4..464dfc998 100644
--- a/basics/tools/pom.xml
+++ b/basics/tools/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
diff --git a/jaxb-annotate-parent/plugin/pom.xml b/jaxb-annotate-parent/plugin/pom.xml
index 64fc2a8ef..69f55c06b 100644
--- a/jaxb-annotate-parent/plugin/pom.xml
+++ b/jaxb-annotate-parent/plugin/pom.xml
@@ -50,7 +50,7 @@
         </exclusion>
         <exclusion>
           <groupId>org.jvnet.jaxb</groupId>
-          <artifactId>jaxb2-basics-runtime</artifactId>
+          <artifactId>jaxb-plugins-runtime</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
diff --git a/jaxb-annotate-parent/tests/pom.xml b/jaxb-annotate-parent/tests/pom.xml
index 456cd10bf..45add5491 100644
--- a/jaxb-annotate-parent/tests/pom.xml
+++ b/jaxb-annotate-parent/tests/pom.xml
@@ -70,7 +70,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
diff --git a/maven-plugin/samples/jaxbplugins/project-pom.xml b/maven-plugin/samples/jaxbplugins/project-pom.xml
index e7904d991..911dba9e0 100644
--- a/maven-plugin/samples/jaxbplugins/project-pom.xml
+++ b/maven-plugin/samples/jaxbplugins/project-pom.xml
@@ -15,7 +15,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/maven-plugin/tests/two/pom.xml b/maven-plugin/tests/two/pom.xml
index cd503ed9f..ca667a03c 100644
--- a/maven-plugin/tests/two/pom.xml
+++ b/maven-plugin/tests/two/pom.xml
@@ -8,13 +8,12 @@
   <dependencies>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
     </dependency>
-		<!-- JUnit -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/maven-plugin/tests/xjc-simple/pom.xml b/maven-plugin/tests/xjc-simple/pom.xml
index 838445fb8..b6c07b02a 100644
--- a/maven-plugin/tests/xjc-simple/pom.xml
+++ b/maven-plugin/tests/xjc-simple/pom.xml
@@ -15,7 +15,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-runtime</artifactId>
+      <artifactId>jaxb-plugins-runtime</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/pom.xml b/pom.xml
index 63e6393ef..8f9858814 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,7 +442,7 @@
       </dependency>
       <dependency>
         <groupId>org.jvnet.jaxb</groupId>
-        <artifactId>jaxb2-basics-runtime</artifactId>
+        <artifactId>jaxb-plugins-runtime</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>