diff --git a/pmd/tools/ant/generate-pmd-xdoc.xml b/maven-plugin-pmd-build/ant/generate-pmd-xdoc.xml
similarity index 100%
rename from pmd/tools/ant/generate-pmd-xdoc.xml
rename to maven-plugin-pmd-build/ant/generate-pmd-xdoc.xml
diff --git a/pmd/tools/ant/ruleset-docs.xml b/maven-plugin-pmd-build/ant/ruleset-docs.xml
similarity index 100%
rename from pmd/tools/ant/ruleset-docs.xml
rename to maven-plugin-pmd-build/ant/ruleset-docs.xml
diff --git a/pmd/tools/config/eclipse-code-formatter-settings.xml b/maven-plugin-pmd-build/config/eclipse-code-formatter-settings.xml
similarity index 100%
rename from pmd/tools/config/eclipse-code-formatter-settings.xml
rename to maven-plugin-pmd-build/config/eclipse-code-formatter-settings.xml
diff --git a/pmd/tools/config/m2.settings.xml b/maven-plugin-pmd-build/config/m2.settings.xml
similarity index 100%
rename from pmd/tools/config/m2.settings.xml
rename to maven-plugin-pmd-build/config/m2.settings.xml
diff --git a/pmd/tools/lib/pmd-build-0.4.jar b/maven-plugin-pmd-build/lib/pmd-build-0.4.jar
similarity index 100%
rename from pmd/tools/lib/pmd-build-0.4.jar
rename to maven-plugin-pmd-build/lib/pmd-build-0.4.jar
diff --git a/pmd/tools/pom.xml b/maven-plugin-pmd-build/pom.xml
similarity index 100%
rename from pmd/tools/pom.xml
rename to maven-plugin-pmd-build/pom.xml
diff --git a/pmd/tools/regress/AntTaskTest.java b/maven-plugin-pmd-build/regress/AntTaskTest.java
similarity index 100%
rename from pmd/tools/regress/AntTaskTest.java
rename to maven-plugin-pmd-build/regress/AntTaskTest.java
diff --git a/pmd/tools/regress/PmdBuildTest.java b/maven-plugin-pmd-build/regress/PmdBuildTest.java
similarity index 100%
rename from pmd/tools/regress/PmdBuildTest.java
rename to maven-plugin-pmd-build/regress/PmdBuildTest.java
diff --git a/pmd/tools/src/config.properties b/maven-plugin-pmd-build/src/config.properties
similarity index 100%
rename from pmd/tools/src/config.properties
rename to maven-plugin-pmd-build/src/config.properties
diff --git a/pmd/tools/src/logging.properties b/maven-plugin-pmd-build/src/logging.properties
similarity index 100%
rename from pmd/tools/src/logging.properties
rename to maven-plugin-pmd-build/src/logging.properties
diff --git a/pmd/tools/src/net/sourceforge/pmd/ant/PmdBuildTask.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/ant/PmdBuildTask.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/ant/PmdBuildTask.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/ant/PmdBuildTask.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/PmdBuildException.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/PmdBuildException.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/PmdBuildException.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/PmdBuildException.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/PmdBuildTools.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/PmdBuildTools.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/PmdBuildTools.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/PmdBuildTools.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/RuleSetToDocs.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/RuleSetToDocs.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/RuleSetToDocs.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/RuleSetToDocs.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/filefilter/DirectoryFileFilter.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/filefilter/DirectoryFileFilter.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/filefilter/DirectoryFileFilter.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/filefilter/DirectoryFileFilter.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/filefilter/RulesetFilenameFilter.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/filefilter/RulesetFilenameFilter.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/filefilter/RulesetFilenameFilter.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/filefilter/RulesetFilenameFilter.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/util/ConfigUtil.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/util/ConfigUtil.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/util/ConfigUtil.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/util/ConfigUtil.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/util/FileUtil.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/util/FileUtil.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/util/FileUtil.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/util/FileUtil.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/util/XmlUtil.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/util/XmlUtil.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/util/XmlUtil.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/util/XmlUtil.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/xml/RulesetFileTemplater.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/xml/RulesetFileTemplater.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/xml/RulesetFileTemplater.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/xml/RulesetFileTemplater.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/build/xml/XmlFileTemplater.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/build/xml/XmlFileTemplater.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/build/xml/XmlFileTemplater.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/build/xml/XmlFileTemplater.java
diff --git a/pmd/tools/src/net/sourceforge/pmd/maven/PmdPreSite.java b/maven-plugin-pmd-build/src/net/sourceforge/pmd/maven/PmdPreSite.java
similarity index 100%
rename from pmd/tools/src/net/sourceforge/pmd/maven/PmdPreSite.java
rename to maven-plugin-pmd-build/src/net/sourceforge/pmd/maven/PmdPreSite.java
diff --git a/pmd/tools/xslt/add-menu-to-site-descriptor.xsl b/maven-plugin-pmd-build/xslt/add-menu-to-site-descriptor.xsl
similarity index 100%
rename from pmd/tools/xslt/add-menu-to-site-descriptor.xsl
rename to maven-plugin-pmd-build/xslt/add-menu-to-site-descriptor.xsl
diff --git a/pmd/tools/xslt/create-rules-menu.xsl b/maven-plugin-pmd-build/xslt/create-rules-menu.xsl
similarity index 100%
rename from pmd/tools/xslt/create-rules-menu.xsl
rename to maven-plugin-pmd-build/xslt/create-rules-menu.xsl
diff --git a/pmd/tools/xslt/merge-rulesets.xsl b/maven-plugin-pmd-build/xslt/merge-rulesets.xsl
similarity index 100%
rename from pmd/tools/xslt/merge-rulesets.xsl
rename to maven-plugin-pmd-build/xslt/merge-rulesets.xsl
diff --git a/pmd/tools/xslt/rule-format.xsl b/maven-plugin-pmd-build/xslt/rule-format.xsl
similarity index 100%
rename from pmd/tools/xslt/rule-format.xsl
rename to maven-plugin-pmd-build/xslt/rule-format.xsl
diff --git a/pmd/tools/xslt/rules-index.xsl b/maven-plugin-pmd-build/xslt/rules-index.xsl
similarity index 100%
rename from pmd/tools/xslt/rules-index.xsl
rename to maven-plugin-pmd-build/xslt/rules-index.xsl
diff --git a/pmd/tools/config/checkstyle-config.xml b/pmd/etc/checkstyle-config.xml
similarity index 100%
rename from pmd/tools/config/checkstyle-config.xml
rename to pmd/etc/checkstyle-config.xml
diff --git a/pmd/tools/config/clover2.license b/pmd/licences/clover2.license
similarity index 100%
rename from pmd/tools/config/clover2.license
rename to pmd/licences/clover2.license
diff --git a/pmd/tools/ant/alljavacc.xml b/pmd/src/main/ant/alljavacc.xml
similarity index 100%
rename from pmd/tools/ant/alljavacc.xml
rename to pmd/src/main/ant/alljavacc.xml