diff --git a/basics/jaxb-plugins-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
index 50df5267e..68dc45558 100644
--- a/basics/jaxb-plugins-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
@@ -92,7 +92,7 @@ public Object copy(ObjectLocator locator, Object object,
 		}.copy(new DefaultRootObjectLocator(a), a);
 
 		assertSame(a1.b.a.b, a1.b);
-		// BUG: See https://github.com/highsource/jaxb2-basics/issues/92
+		// BUG: See https://github.com/highsource/jaxb-tools/issues/92
 		// assertSame(a1.b.a, a1);
 	}
 
diff --git a/basics/jaxb-plugins-shaded/pom.xml b/basics/jaxb-plugins-shaded/pom.xml
index 383536364..a82e4b8fc 100644
--- a/basics/jaxb-plugins-shaded/pom.xml
+++ b/basics/jaxb-plugins-shaded/pom.xml
@@ -11,7 +11,7 @@
   <dependencies>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
diff --git a/basics/basic/pom.xml b/basics/jaxb-plugins/pom.xml
similarity index 97%
rename from basics/basic/pom.xml
rename to basics/jaxb-plugins/pom.xml
index 68a2db556..1899dbe29 100644
--- a/basics/basic/pom.xml
+++ b/basics/jaxb-plugins/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</artifactId>
+  <artifactId>jaxb-plugins</artifactId>
   <packaging>jar</packaging>
-  <name>JAXB Tools :: JAXB Basics :: Basic Plugins</name>
+  <name>JAXB Tools :: JAXB Plugins :: Plugins</name>
   <parent>
     <groupId>org.jvnet.jaxb</groupId>
     <artifactId>jaxb-basics-project</artifactId>
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentApiPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentApiPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentApiPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentApiPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodInfo.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodInfo.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodInfo.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodInfo.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodType.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodType.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodType.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodType.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/ValueConstructorPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/ValueConstructorPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/ValueConstructorPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/ValueConstructorPlugin.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java
diff --git a/basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java b/basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java
similarity index 100%
rename from basics/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java
rename to basics/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java
diff --git a/basics/basic/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin b/basics/jaxb-plugins/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
similarity index 100%
rename from basics/basic/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
rename to basics/jaxb-plugins/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin
diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java b/basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java
similarity index 100%
rename from basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java
rename to basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java
diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java b/basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java
similarity index 100%
rename from basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java
rename to basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java
diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java b/basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java
similarity index 100%
rename from basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java
rename to basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java
diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java b/basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java
similarity index 100%
rename from basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java
rename to basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java
diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java b/basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java
similarity index 100%
rename from basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java
rename to basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java
diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java b/basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java
similarity index 100%
rename from basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java
rename to basics/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java
diff --git a/basics/basic/src/test/resources/schema.xsd b/basics/jaxb-plugins/src/test/resources/schema.xsd
similarity index 100%
rename from basics/basic/src/test/resources/schema.xsd
rename to basics/jaxb-plugins/src/test/resources/schema.xsd
diff --git a/basics/pom.xml b/basics/pom.xml
index d70fe0536..633c3da4b 100644
--- a/basics/pom.xml
+++ b/basics/pom.xml
@@ -8,14 +8,14 @@
   </parent>
   <artifactId>jaxb-basics-project</artifactId>
   <packaging>pom</packaging>
-  <name>JAXB Tools :: JAXB Basics :: Project</name>
+  <name>JAXB Tools :: JAXB Plugins :: Project</name>
   <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>jaxb-plugins-runtime</module>
     <module>jaxb-plugins-tools</module>
     <module>jaxb-plugins-testing</module>
-    <module>basic</module>
+    <module>jaxb-plugins</module>
     <module>jaxb-plugins-shaded</module>
   </modules>
   <profiles>
diff --git a/basics/samples/basic/project-pom.xml b/basics/samples/basic/project-pom.xml
index 17f8cb072..24590b1b6 100644
--- a/basics/samples/basic/project-pom.xml
+++ b/basics/samples/basic/project-pom.xml
@@ -73,7 +73,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
               <version>${project.version}</version>
             </plugin>
           </plugins>
diff --git a/basics/samples/cxf/project-pom.xml b/basics/samples/cxf/project-pom.xml
index bb6bfb67c..cbb6a5f91 100644
--- a/basics/samples/cxf/project-pom.xml
+++ b/basics/samples/cxf/project-pom.xml
@@ -103,7 +103,7 @@
           </dependency>
           <dependency>
             <groupId>org.jvnet.jaxb</groupId>
-            <artifactId>jaxb2-basics</artifactId>
+            <artifactId>jaxb-plugins</artifactId>
             <version>${project.version}</version>
           </dependency>
         </dependencies>
diff --git a/basics/samples/po-simple/project-pom.xml b/basics/samples/po-simple/project-pom.xml
index 859da4338..8c64bdbc0 100644
--- a/basics/samples/po-simple/project-pom.xml
+++ b/basics/samples/po-simple/project-pom.xml
@@ -70,7 +70,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
               <version>${project.version}</version>
             </plugin>
           </plugins>
diff --git a/basics/samples/po/project-pom.xml b/basics/samples/po/project-pom.xml
index 0c8a570b4..0b6aad425 100644
--- a/basics/samples/po/project-pom.xml
+++ b/basics/samples/po/project-pom.xml
@@ -73,7 +73,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
               <version>${project.version}</version>
             </plugin>
           </plugins>
diff --git a/basics/tests/JAXB-1058/pom.xml b/basics/tests/JAXB-1058/pom.xml
index c466f306c..8b55181e7 100644
--- a/basics/tests/JAXB-1058/pom.xml
+++ b/basics/tests/JAXB-1058/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/commons_lang/pom.xml b/basics/tests/commons_lang/pom.xml
index a123378a9..50ca60834 100644
--- a/basics/tests/commons_lang/pom.xml
+++ b/basics/tests/commons_lang/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/defaultvalue/pom.xml b/basics/tests/defaultvalue/pom.xml
index 3e33f835c..d2d45ef3f 100644
--- a/basics/tests/defaultvalue/pom.xml
+++ b/basics/tests/defaultvalue/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/episodes/a/pom.xml b/basics/tests/episodes/a/pom.xml
index b2dc6cfda..685df2774 100644
--- a/basics/tests/episodes/a/pom.xml
+++ b/basics/tests/episodes/a/pom.xml
@@ -28,7 +28,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/episodes/b/pom.xml b/basics/tests/episodes/b/pom.xml
index e9c3cf017..b443a5139 100644
--- a/basics/tests/episodes/b/pom.xml
+++ b/basics/tests/episodes/b/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
           <episodes>
diff --git a/basics/tests/ignoring/pom.xml b/basics/tests/ignoring/pom.xml
index ef6d88b6d..eba899a6b 100644
--- a/basics/tests/ignoring/pom.xml
+++ b/basics/tests/ignoring/pom.xml
@@ -28,7 +28,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/issues/pom.xml b/basics/tests/issues/pom.xml
index e51890bc6..45009aaf0 100644
--- a/basics/tests/issues/pom.xml
+++ b/basics/tests/issues/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -55,7 +55,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/namespace/pom.xml b/basics/tests/namespace/pom.xml
index fb32dc263..2db1ffd43 100644
--- a/basics/tests/namespace/pom.xml
+++ b/basics/tests/namespace/pom.xml
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/one/pom.xml b/basics/tests/one/pom.xml
index 59abf1e16..9f5d1c874 100644
--- a/basics/tests/one/pom.xml
+++ b/basics/tests/one/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -39,7 +39,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/po/pom.xml b/basics/tests/po/pom.xml
index b3b749d44..3385cf331 100644
--- a/basics/tests/po/pom.xml
+++ b/basics/tests/po/pom.xml
@@ -37,7 +37,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/qa-simple/pom.xml b/basics/tests/qa-simple/pom.xml
index 1e1d1ee0c..b7ba52878 100644
--- a/basics/tests/qa-simple/pom.xml
+++ b/basics/tests/qa-simple/pom.xml
@@ -39,7 +39,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/qa-strategic/pom.xml b/basics/tests/qa-strategic/pom.xml
index 8f0bcd230..b0fdfa8b0 100644
--- a/basics/tests/qa-strategic/pom.xml
+++ b/basics/tests/qa-strategic/pom.xml
@@ -40,7 +40,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/simple-hashCode-equals-01/pom.xml b/basics/tests/simple-hashCode-equals-01/pom.xml
index 3adcaa9af..7ca66b6db 100644
--- a/basics/tests/simple-hashCode-equals-01/pom.xml
+++ b/basics/tests/simple-hashCode-equals-01/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -32,12 +32,12 @@
           <args>
             <arg>-XsimpleEquals</arg>
             <arg>-XsimpleHashCode</arg>
-						<!-- arg>-XsimpleToString</arg-->
+            <!-- arg>-XsimpleToString</arg-->
           </args>
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/simplify-01/pom.xml b/basics/tests/simplify-01/pom.xml
index adf1c6add..69fd2e965 100644
--- a/basics/tests/simplify-01/pom.xml
+++ b/basics/tests/simplify-01/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
@@ -40,7 +40,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/simplify-02/pom.xml b/basics/tests/simplify-02/pom.xml
index 139bb51e3..00164c5cf 100644
--- a/basics/tests/simplify-02/pom.xml
+++ b/basics/tests/simplify-02/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>joda-time</groupId>
@@ -39,7 +39,7 @@
 					<plugins>
 						<plugin>
 							<groupId>org.jvnet.jaxb</groupId>
-							<artifactId>jaxb2-basics</artifactId>
+							<artifactId>jaxb-plugins</artifactId>
 						</plugin>
 					</plugins>
 				</configuration>
diff --git a/basics/tests/superclass/a/pom.xml b/basics/tests/superclass/a/pom.xml
index e1dacd1d2..3d979d2a5 100644
--- a/basics/tests/superclass/a/pom.xml
+++ b/basics/tests/superclass/a/pom.xml
@@ -28,7 +28,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/superclass/b/pom.xml b/basics/tests/superclass/b/pom.xml
index 43f4f93fb..751ef55bd 100644
--- a/basics/tests/superclass/b/pom.xml
+++ b/basics/tests/superclass/b/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -45,7 +45,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
diff --git a/basics/tests/wildcard/pom.xml b/basics/tests/wildcard/pom.xml
index 96e6a2209..b20e1fef5 100644
--- a/basics/tests/wildcard/pom.xml
+++ b/basics/tests/wildcard/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
   </dependencies>
   <build>
@@ -35,7 +35,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/basics/tests/zj/pom.xml b/basics/tests/zj/pom.xml
index fba77479e..22bb30e8c 100644
--- a/basics/tests/zj/pom.xml
+++ b/basics/tests/zj/pom.xml
@@ -26,7 +26,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/jaxb-annotate-parent/tests/issues/pom.xml b/jaxb-annotate-parent/tests/issues/pom.xml
index 43b138c03..f29f813af 100644
--- a/jaxb-annotate-parent/tests/issues/pom.xml
+++ b/jaxb-annotate-parent/tests/issues/pom.xml
@@ -80,7 +80,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
diff --git a/jaxb-annotate-parent/tests/pom.xml b/jaxb-annotate-parent/tests/pom.xml
index 45add5491..d3eca4303 100644
--- a/jaxb-annotate-parent/tests/pom.xml
+++ b/jaxb-annotate-parent/tests/pom.xml
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin/plugin/src/test/resources/test-pom.xml b/maven-plugin/plugin/src/test/resources/test-pom.xml
index 6115b03ce..df1d5db3b 100644
--- a/maven-plugin/plugin/src/test/resources/test-pom.xml
+++ b/maven-plugin/plugin/src/test/resources/test-pom.xml
@@ -10,11 +10,11 @@
   <dependencies>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics-testing</artifactId>
+      <artifactId>jaxb-plugins-testing</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -41,7 +41,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/maven-plugin/samples/jaxbplugins/project-pom.xml b/maven-plugin/samples/jaxbplugins/project-pom.xml
index 911dba9e0..1b3b77b6c 100644
--- a/maven-plugin/samples/jaxbplugins/project-pom.xml
+++ b/maven-plugin/samples/jaxbplugins/project-pom.xml
@@ -41,7 +41,7 @@
               <plugins>
                 <plugin>
                   <groupId>org.jvnet.jaxb</groupId>
-                  <artifactId>jaxb2-basics</artifactId>
+                  <artifactId>jaxb-plugins</artifactId>
                   <version>${project.version}</version>
                 </plugin>
               </plugins>
diff --git a/maven-plugin/samples/pom.xml b/maven-plugin/samples/pom.xml
index 6609076ad..c820f8cf5 100644
--- a/maven-plugin/samples/pom.xml
+++ b/maven-plugin/samples/pom.xml
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -44,7 +44,7 @@
         <executions>
           <execution>
             <id>maven-assembly</id>
-						<!--phase>package</phase-->
+            <!--phase>package</phase-->
             <phase>none</phase>
             <goals>
               <goal>single</goal>
diff --git a/maven-plugin/tests/jt-250/pom.xml b/maven-plugin/tests/jt-250/pom.xml
index 16cf50120..e8c742d34 100644
--- a/maven-plugin/tests/jt-250/pom.xml
+++ b/maven-plugin/tests/jt-250/pom.xml
@@ -61,7 +61,7 @@
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb</groupId>
-              <artifactId>jaxb2-basics</artifactId>
+              <artifactId>jaxb-plugins</artifactId>
             </plugin>
           </plugins>
         </configuration>
diff --git a/maven-plugin/tests/pom.xml b/maven-plugin/tests/pom.xml
index 04965d7d9..d2a750294 100644
--- a/maven-plugin/tests/pom.xml
+++ b/maven-plugin/tests/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>org.jvnet.jaxb</groupId>
-      <artifactId>jaxb2-basics</artifactId>
+      <artifactId>jaxb-plugins</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugin/tests/two/pom.xml b/maven-plugin/tests/two/pom.xml
index ca667a03c..c3a5c85bf 100644
--- a/maven-plugin/tests/two/pom.xml
+++ b/maven-plugin/tests/two/pom.xml
@@ -58,7 +58,7 @@
               <plugins>
                 <plugin>
                   <groupId>org.jvnet.jaxb</groupId>
-                  <artifactId>jaxb2-basics</artifactId>
+                  <artifactId>jaxb-plugins</artifactId>
                   <version>${project.version}</version>
                 </plugin>
               </plugins>
diff --git a/maven-plugin/tests/xjc-simple/pom.xml b/maven-plugin/tests/xjc-simple/pom.xml
index b6c07b02a..4f78e3197 100644
--- a/maven-plugin/tests/xjc-simple/pom.xml
+++ b/maven-plugin/tests/xjc-simple/pom.xml
@@ -39,7 +39,7 @@
               <plugins>
                 <plugin>
                   <groupId>org.jvnet.jaxb</groupId>
-                  <artifactId>jaxb2-basics</artifactId>
+                  <artifactId>jaxb-plugins</artifactId>
                   <version>${project.version}</version>
                 </plugin>
               </plugins>
diff --git a/pom.xml b/pom.xml
index 95fca61f6..433e0728d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,7 +432,7 @@
       <!-- JAXB Basics -->
       <dependency>
         <groupId>org.jvnet.jaxb</groupId>
-        <artifactId>jaxb2-basics</artifactId>
+        <artifactId>jaxb-plugins</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>