diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
similarity index 97%
rename from pmd/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
index e4d027d72c..6fa30de53f 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
@@ -15,9 +15,6 @@ import net.sourceforge.pmd.lang.java.ast.Token;
 
 public class JavaTokenizer implements Tokenizer {
 
-    public static final String IGNORE_LITERALS = "ignore_literals";
-    public static final String IGNORE_IDENTIFIERS = "ignore_identifiers";
-    public static final String IGNORE_ANNOTATIONS = "ignore_annotations";
     public static final String CPD_START = "\"CPD-START\"";
     public static final String CPD_END = "\"CPD-END\"";
 
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java13Handler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java13Handler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java13Handler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java13Handler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java13Parser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java13Parser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java13Parser.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java13Parser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java14Handler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java14Handler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java14Handler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java14Handler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java14Parser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java14Parser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java14Parser.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java14Parser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java15Handler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java15Handler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java15Handler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java15Handler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java15Parser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java15Parser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java15Parser.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java15Parser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java16Handler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java16Handler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java16Handler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java16Handler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java16Parser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java16Parser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java16Parser.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java16Parser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java17Handler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java17Handler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java17Handler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java17Handler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java17Parser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java17Parser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java17Parser.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java17Parser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java18Handler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java18Handler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java18Handler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java18Handler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/Java18Parser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java18Parser.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/Java18Parser.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/Java18Parser.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/JavaLanguageModule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaLanguageModule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/JavaLanguageModule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaLanguageModule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotation.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperator.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlock.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlock.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlock.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlock.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteral.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteral.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteral.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCatchStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCompilationUnit.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConstructorDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExplicitConstructorInvocation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExplicitConstructorInvocation.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExplicitConstructorInvocation.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExplicitConstructorInvocation.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExtendsList.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameter.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameter.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameter.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIfStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIfStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIfStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTIfStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInitializer.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInitializer.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInitializer.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTName.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryPrefix.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimitiveType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimitiveType.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimitiveType.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimitiveType.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReferenceType.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabel.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessTypeNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessTypeNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessTypeNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessTypeNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaTypeNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaTypeNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaTypeNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaTypeNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AccessNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AccessNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/AccessNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AccessNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/CanSuppressWarnings.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/CanSuppressWarnings.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/CanSuppressWarnings.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/CanSuppressWarnings.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/CommentUtil.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/CommentUtil.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/CommentUtil.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/CommentUtil.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/Dimensionable.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Dimensionable.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/Dimensionable.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Dimensionable.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/DummyJavaNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/DummyJavaNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/DummyJavaNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/DummyJavaNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/DumpFacade.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/DumpFacade.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/DumpFacade.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/DumpFacade.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/FormalComment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/FormalComment.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/FormalComment.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/FormalComment.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavadocElement.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/MultiLineComment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/MultiLineComment.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/MultiLineComment.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/MultiLineComment.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/SingleLineComment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/SingleLineComment.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/SingleLineComment.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/SingleLineComment.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/TypeNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/TypeNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/ast/TypeNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/TypeNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinder.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinder.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinder.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinder.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessVisitor.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessVisitor.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessVisitor.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/javadoc/JavadocTag.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/javadoc/JavadocTag.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/javadoc/JavadocTag.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/javadoc/JavadocTag.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractInefficientZeroCheck.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractInefficientZeroCheck.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractInefficientZeroCheck.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractInefficientZeroCheck.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractPoorMethodCall.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractPoorMethodCall.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractPoorMethodCall.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractPoorMethodCall.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/GenericLiteralCheckerRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/GenericLiteralCheckerRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/GenericLiteralCheckerRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/GenericLiteralCheckerRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolation.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolation.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolation.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationFactory.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationFactory.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationFactory.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationFactory.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/SymbolTableTestRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/SymbolTableTestRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/SymbolTableTestRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/SymbolTableTestRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidBranchingStatementAsLastInLoopRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidBranchingStatementAsLastInLoopRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidBranchingStatementAsLastInLoopRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidBranchingStatementAsLastInLoopRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidMultipleUnaryOperatorsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidMultipleUnaryOperatorsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidMultipleUnaryOperatorsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidMultipleUnaryOperatorsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingHardCodedIPRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingHardCodedIPRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingHardCodedIPRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingHardCodedIPRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BigIntegerInstantiationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BigIntegerInstantiationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BigIntegerInstantiationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BigIntegerInstantiationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BooleanInstantiationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BooleanInstantiationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BooleanInstantiationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BooleanInstantiationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BrokenNullCheckRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BrokenNullCheckRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BrokenNullCheckRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/BrokenNullCheckRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckResultSetRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckResultSetRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckResultSetRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckResultSetRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckSkipResultRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckSkipResultRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckSkipResultRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/CheckSkipResultRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/DoubleCheckedLockingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/DoubleCheckedLockingRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/DoubleCheckedLockingRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/DoubleCheckedLockingRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/OverrideBothEqualsAndHashcodeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/OverrideBothEqualsAndHashcodeRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/OverrideBothEqualsAndHashcodeRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/OverrideBothEqualsAndHashcodeRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/AbstractNcssCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/AbstractNcssCountRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/AbstractNcssCountRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/AbstractNcssCountRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/CyclomaticComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/CyclomaticComplexityRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/CyclomaticComplexityRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/CyclomaticComplexityRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveClassLengthRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveClassLengthRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveClassLengthRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveClassLengthRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveMethodLengthRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveMethodLengthRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveMethodLengthRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveMethodLengthRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveParameterListRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveParameterListRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveParameterListRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessiveParameterListRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessivePublicCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessivePublicCountRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessivePublicCountRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ExcessivePublicCountRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ModifiedCyclomaticComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ModifiedCyclomaticComplexityRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ModifiedCyclomaticComplexityRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/ModifiedCyclomaticComplexityRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NPathComplexityRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssConstructorCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssConstructorCountRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssConstructorCountRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssConstructorCountRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssMethodCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssMethodCountRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssMethodCountRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssMethodCountRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssTypeCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssTypeCountRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssTypeCountRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/NcssTypeCountRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/TooManyFieldsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/TooManyFieldsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/TooManyFieldsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/TooManyFieldsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CodeInCommentsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CodeInCommentsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CodeInCommentsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CodeInCommentsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentContentRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentContentRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentContentRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentContentRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRequiredRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRequiredRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRequiredRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRequiredRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/HeaderCommentsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/HeaderCommentsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/HeaderCommentsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/HeaderCommentsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/JavadocRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/JavadocRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/JavadocRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/JavadocRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/AssignmentInOperandRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/AssignmentInOperandRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/AssignmentInOperandRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/AssignmentInOperandRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DaaRuleViolation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DaaRuleViolation.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DaaRuleViolation.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DaaRuleViolation.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DataflowAnomalyAnalysisRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DataflowAnomalyAnalysisRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DataflowAnomalyAnalysisRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DataflowAnomalyAnalysisRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DontImportSunRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DontImportSunRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DontImportSunRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DontImportSunRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/NullAssignmentRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/NullAssignmentRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/NullAssignmentRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/NullAssignmentRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/OnlyOneReturnRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/OnlyOneReturnRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/OnlyOneReturnRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/OnlyOneReturnRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/SuspiciousOctalEscapeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/SuspiciousOctalEscapeRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/SuspiciousOctalEscapeRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/SuspiciousOctalEscapeRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/ExcessiveImportsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/ExcessiveImportsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/ExcessiveImportsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/ExcessiveImportsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LawOfDemeterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LawOfDemeterRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LawOfDemeterRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LawOfDemeterRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LooseCouplingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LooseCouplingRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LooseCouplingRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LooseCouplingRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LoosePackageCouplingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LoosePackageCouplingRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LoosePackageCouplingRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/LoosePackageCouplingRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AccessorClassGenerationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AccessorClassGenerationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AccessorClassGenerationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AccessorClassGenerationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AssignmentToNonFinalStaticRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AssignmentToNonFinalStaticRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AssignmentToNonFinalStaticRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AssignmentToNonFinalStaticRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidReassigningParametersRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidReassigningParametersRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidReassigningParametersRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidReassigningParametersRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CloseResourceRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CompareObjectsWithEqualsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CompareObjectsWithEqualsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CompareObjectsWithEqualsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CompareObjectsWithEqualsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConfusingTernaryRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConfusingTernaryRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConfusingTernaryRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConfusingTernaryRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConstructorCallsOverridableMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConstructorCallsOverridableMethodRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConstructorCallsOverridableMethodRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ConstructorCallsOverridableMethodRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveLengthRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveLengthRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveLengthRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveLengthRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveNodeCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveNodeCountRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveNodeCountRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveNodeCountRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GenericClassCounterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GenericClassCounterRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GenericClassCounterRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GenericClassCounterRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GodClassRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GodClassRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GodClassRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/GodClassRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/IdempotentOperationsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/IdempotentOperationsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/IdempotentOperationsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/IdempotentOperationsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NonThreadSafeSingletonRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NonThreadSafeSingletonRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NonThreadSafeSingletonRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NonThreadSafeSingletonRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PreserveStackTraceRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnnecessaryLocalBeforeReturnRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnnecessaryLocalBeforeReturnRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnnecessaryLocalBeforeReturnRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnnecessaryLocalBeforeReturnRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnsynchronizedStaticDateFormatterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnsynchronizedStaticDateFormatterRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnsynchronizedStaticDateFormatterRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UnsynchronizedStaticDateFormatterRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseCollectionIsEmptyRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseCollectionIsEmptyRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseCollectionIsEmptyRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseCollectionIsEmptyRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/finalizers/AvoidCallingFinalizeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/finalizers/AvoidCallingFinalizeRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/finalizers/AvoidCallingFinalizeRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/finalizers/AvoidCallingFinalizeRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DontImportJavaLangRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DontImportJavaLangRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DontImportJavaLangRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DontImportJavaLangRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/DuplicateImportsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/ImportFromSamePackageRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/ImportFromSamePackageRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/ImportFromSamePackageRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/ImportFromSamePackageRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnusedImportsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/javabeans/BeanMembersShouldSerializeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/javabeans/BeanMembersShouldSerializeRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/javabeans/BeanMembersShouldSerializeRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/javabeans/BeanMembersShouldSerializeRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/AbstractJUnitRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/AbstractJUnitRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/AbstractJUnitRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/AbstractJUnitRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitTestsShouldIncludeAssertRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/TestClassWithoutTestCasesRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/TestClassWithoutTestCasesRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/TestClassWithoutTestCasesRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/TestClassWithoutTestCasesRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardDebugLoggingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardDebugLoggingRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardDebugLoggingRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardDebugLoggingRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementJavaUtilRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementJavaUtilRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementJavaUtilRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementJavaUtilRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/GuardLogStatementRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/MoreThanOneLoggerRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/MoreThanOneLoggerRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/MoreThanOneLoggerRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/logging/MoreThanOneLoggerRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/JUnitUseExpectedRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/JUnitUseExpectedRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/JUnitUseExpectedRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/JUnitUseExpectedRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/UnnecessaryCastRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/UnnecessaryCastRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/UnnecessaryCastRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/migrating/UnnecessaryCastRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidDollarSignsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidDollarSignsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidDollarSignsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidDollarSignsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingMethodNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingMethodNameRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingMethodNameRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingMethodNameRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingTypeNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingTypeNameRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingTypeNameRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/AvoidFieldNameMatchingTypeNameRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/ClassNamingConventionsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/ClassNamingConventionsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/ClassNamingConventionsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/ClassNamingConventionsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodNamingConventionsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodNamingConventionsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodNamingConventionsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodNamingConventionsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodWithSameNameAsEnclosingClassRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodWithSameNameAsEnclosingClassRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodWithSameNameAsEnclosingClassRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/MethodWithSameNameAsEnclosingClassRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/SuspiciousHashcodeMethodNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/SuspiciousHashcodeMethodNameRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/SuspiciousHashcodeMethodNameRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/SuspiciousHashcodeMethodNameRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/VariableNamingConventionsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/VariableNamingConventionsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/VariableNamingConventionsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/naming/VariableNamingConventionsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AbstractOptimizationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AbstractOptimizationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AbstractOptimizationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AbstractOptimizationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AvoidInstantiatingObjectsInLoopsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AvoidInstantiatingObjectsInLoopsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AvoidInstantiatingObjectsInLoopsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/AvoidInstantiatingObjectsInLoopsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/LocalVariableCouldBeFinalRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/LocalVariableCouldBeFinalRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/LocalVariableCouldBeFinalRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/LocalVariableCouldBeFinalRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/MethodArgumentCouldBeFinalRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/MethodArgumentCouldBeFinalRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/MethodArgumentCouldBeFinalRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/MethodArgumentCouldBeFinalRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/PrematureDeclarationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/PrematureDeclarationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/PrematureDeclarationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/PrematureDeclarationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/RedundantFieldInitializerRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/RedundantFieldInitializerRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/RedundantFieldInitializerRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/RedundantFieldInitializerRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UnnecessaryWrapperObjectCreationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UnnecessaryWrapperObjectCreationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UnnecessaryWrapperObjectCreationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UnnecessaryWrapperObjectCreationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UseStringBufferForStringAppendsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UseStringBufferForStringAppendsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UseStringBufferForStringAppendsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/optimizations/UseStringBufferForStringAppendsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/regex/RegexHelper.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/regex/RegexHelper.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/regex/RegexHelper.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/regex/RegexHelper.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/AvoidCatchingThrowableRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/AvoidCatchingThrowableRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/AvoidCatchingThrowableRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/AvoidCatchingThrowableRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/ExceptionAsFlowControlRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/ExceptionAsFlowControlRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/ExceptionAsFlowControlRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/ExceptionAsFlowControlRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/SignatureDeclareThrowsExceptionRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/SignatureDeclareThrowsExceptionRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/SignatureDeclareThrowsExceptionRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strictexception/SignatureDeclareThrowsExceptionRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AppendCharacterWithCharRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AppendCharacterWithCharRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AppendCharacterWithCharRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AppendCharacterWithCharRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveAppendsShouldReuseRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveAppendsShouldReuseRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveAppendsShouldReuseRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveAppendsShouldReuseRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientEmptyStringCheckRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientEmptyStringCheckRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientEmptyStringCheckRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientEmptyStringCheckRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientStringBufferingRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientStringBufferingRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientStringBufferingRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InefficientStringBufferingRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InsufficientStringBufferDeclarationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InsufficientStringBufferDeclarationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InsufficientStringBufferDeclarationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/InsufficientStringBufferDeclarationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringInstantiationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringInstantiationRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringInstantiationRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringInstantiationRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringToStringRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringToStringRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringToStringRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/StringToStringRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UnnecessaryCaseChangeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UnnecessaryCaseChangeRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UnnecessaryCaseChangeRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UnnecessaryCaseChangeRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseIndexOfCharRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseIndexOfCharRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseIndexOfCharRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseIndexOfCharRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseStringBufferLengthRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseStringBufferLengthRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseStringBufferLengthRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UseStringBufferLengthRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UselessStringValueOfRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UselessStringValueOfRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UselessStringValueOfRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/UselessStringValueOfRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/AbstractSunSecureRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/AbstractSunSecureRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/AbstractSunSecureRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/AbstractSunSecureRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/ArrayIsStoredDirectlyRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/ArrayIsStoredDirectlyRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/ArrayIsStoredDirectlyRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/ArrayIsStoredDirectlyRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/MethodReturnsInternalArrayRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/MethodReturnsInternalArrayRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/MethodReturnsInternalArrayRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/sunsecure/MethodReturnsInternalArrayRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryConversionTemporaryRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryConversionTemporaryRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryConversionTemporaryRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryConversionTemporaryRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryReturnRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryReturnRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryReturnRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryReturnRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOperationOnImmutableRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOperationOnImmutableRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOperationOnImmutableRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOperationOnImmutableRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOverridingMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOverridingMethodRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOverridingMethodRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UselessOverridingMethodRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedFormalParameterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedFormalParameterRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedFormalParameterRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedFormalParameterRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedLocalVariableRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedLocalVariableRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedLocalVariableRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedLocalVariableRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedModifierRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedModifierRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedModifierRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedModifierRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateFieldRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateFieldRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateFieldRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateFieldRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateMethodRule.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateMethodRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedPrivateMethodRule.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/AbstractJavaScope.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/AbstractJavaScope.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/AbstractJavaScope.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/AbstractJavaScope.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Applier.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Applier.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Applier.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Applier.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunction.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunction.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunction.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunction.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/JavaNameOccurrence.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/JavaNameOccurrence.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/JavaNameOccurrence.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/JavaNameOccurrence.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/LocalScope.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/LocalScope.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/LocalScope.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/LocalScope.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodScope.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodScope.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodScope.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/MethodScope.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/NameFinder.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/NameFinder.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/NameFinder.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/NameFinder.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ScopeAndDeclarationFinder.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ScopeAndDeclarationFinder.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ScopeAndDeclarationFinder.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ScopeAndDeclarationFinder.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Search.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Search.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Search.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/Search.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SymbolFacade.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SymbolFacade.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SymbolFacade.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SymbolFacade.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypedNameDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypedNameDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypedNameDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypedNameDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunction.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunction.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunction.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunction.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/ClassTypeResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/ClassTypeResolver.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/ClassTypeResolver.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/ClassTypeResolver.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/PMDASMClassLoader.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/PMDASMClassLoader.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/PMDASMClassLoader.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/PMDASMClassLoader.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeHelper.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeHelper.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeHelper.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeHelper.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeResolutionFacade.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeResolutionFacade.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeResolutionFacade.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/TypeResolutionFacade.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/CloneMethodMustImplementCloneable.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/CloneMethodMustImplementCloneable.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/CloneMethodMustImplementCloneable.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/CloneMethodMustImplementCloneable.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/LooseCoupling.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/LooseCoupling.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/LooseCoupling.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/LooseCoupling.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/SignatureDeclareThrowsException.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/SignatureDeclareThrowsException.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/SignatureDeclareThrowsException.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/SignatureDeclareThrowsException.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/rules/imports/UnusedImports.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/visitors/PMDASMVisitor.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/xpath/JavaFunctions.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/JavaFunctions.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/xpath/JavaFunctions.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/JavaFunctions.java
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java
similarity index 100%
rename from pmd/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java
diff --git a/pmd-java/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd-java/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
new file mode 100644
index 0000000000..98ca0d58e4
--- /dev/null
+++ b/pmd-java/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
@@ -0,0 +1 @@
+net.sourceforge.pmd.lang.java.JavaLanguageModule
diff --git a/pmd/src/main/resources/rulesets/java/android.xml b/pmd-java/src/main/resources/rulesets/java/android.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/android.xml
rename to pmd-java/src/main/resources/rulesets/java/android.xml
diff --git a/pmd/src/main/resources/rulesets/java/basic.xml b/pmd-java/src/main/resources/rulesets/java/basic.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/basic.xml
rename to pmd-java/src/main/resources/rulesets/java/basic.xml
diff --git a/pmd/src/main/resources/rulesets/java/braces.xml b/pmd-java/src/main/resources/rulesets/java/braces.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/braces.xml
rename to pmd-java/src/main/resources/rulesets/java/braces.xml
diff --git a/pmd/src/main/resources/rulesets/java/clone.xml b/pmd-java/src/main/resources/rulesets/java/clone.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/clone.xml
rename to pmd-java/src/main/resources/rulesets/java/clone.xml
diff --git a/pmd/src/main/resources/rulesets/java/codesize.xml b/pmd-java/src/main/resources/rulesets/java/codesize.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/codesize.xml
rename to pmd-java/src/main/resources/rulesets/java/codesize.xml
diff --git a/pmd/src/main/resources/rulesets/java/comments.xml b/pmd-java/src/main/resources/rulesets/java/comments.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/comments.xml
rename to pmd-java/src/main/resources/rulesets/java/comments.xml
diff --git a/pmd/src/main/resources/rulesets/java/controversial.xml b/pmd-java/src/main/resources/rulesets/java/controversial.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/controversial.xml
rename to pmd-java/src/main/resources/rulesets/java/controversial.xml
diff --git a/pmd/src/main/resources/rulesets/java/coupling.xml b/pmd-java/src/main/resources/rulesets/java/coupling.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/coupling.xml
rename to pmd-java/src/main/resources/rulesets/java/coupling.xml
diff --git a/pmd/src/main/resources/rulesets/java/design.xml b/pmd-java/src/main/resources/rulesets/java/design.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/design.xml
rename to pmd-java/src/main/resources/rulesets/java/design.xml
diff --git a/pmd/src/main/resources/rulesets/java/empty.xml b/pmd-java/src/main/resources/rulesets/java/empty.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/empty.xml
rename to pmd-java/src/main/resources/rulesets/java/empty.xml
diff --git a/pmd/src/main/resources/rulesets/java/finalizers.xml b/pmd-java/src/main/resources/rulesets/java/finalizers.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/finalizers.xml
rename to pmd-java/src/main/resources/rulesets/java/finalizers.xml
diff --git a/pmd/src/main/resources/rulesets/java/imports.xml b/pmd-java/src/main/resources/rulesets/java/imports.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/imports.xml
rename to pmd-java/src/main/resources/rulesets/java/imports.xml
diff --git a/pmd/src/main/resources/rulesets/java/j2ee.xml b/pmd-java/src/main/resources/rulesets/java/j2ee.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/j2ee.xml
rename to pmd-java/src/main/resources/rulesets/java/j2ee.xml
diff --git a/pmd/src/main/resources/rulesets/java/javabeans.xml b/pmd-java/src/main/resources/rulesets/java/javabeans.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/javabeans.xml
rename to pmd-java/src/main/resources/rulesets/java/javabeans.xml
diff --git a/pmd/src/main/resources/rulesets/java/junit.xml b/pmd-java/src/main/resources/rulesets/java/junit.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/junit.xml
rename to pmd-java/src/main/resources/rulesets/java/junit.xml
diff --git a/pmd/src/main/resources/rulesets/java/logging-jakarta-commons.xml b/pmd-java/src/main/resources/rulesets/java/logging-jakarta-commons.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/logging-jakarta-commons.xml
rename to pmd-java/src/main/resources/rulesets/java/logging-jakarta-commons.xml
diff --git a/pmd/src/main/resources/rulesets/java/logging-java.xml b/pmd-java/src/main/resources/rulesets/java/logging-java.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/logging-java.xml
rename to pmd-java/src/main/resources/rulesets/java/logging-java.xml
diff --git a/pmd/src/main/resources/rulesets/java/migrating.xml b/pmd-java/src/main/resources/rulesets/java/migrating.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/migrating.xml
rename to pmd-java/src/main/resources/rulesets/java/migrating.xml
diff --git a/pmd/src/main/resources/rulesets/java/migrating_to_13.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_13.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/migrating_to_13.xml
rename to pmd-java/src/main/resources/rulesets/java/migrating_to_13.xml
diff --git a/pmd/src/main/resources/rulesets/java/migrating_to_14.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_14.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/migrating_to_14.xml
rename to pmd-java/src/main/resources/rulesets/java/migrating_to_14.xml
diff --git a/pmd/src/main/resources/rulesets/java/migrating_to_15.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_15.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/migrating_to_15.xml
rename to pmd-java/src/main/resources/rulesets/java/migrating_to_15.xml
diff --git a/pmd/src/main/resources/rulesets/java/migrating_to_junit4.xml b/pmd-java/src/main/resources/rulesets/java/migrating_to_junit4.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/migrating_to_junit4.xml
rename to pmd-java/src/main/resources/rulesets/java/migrating_to_junit4.xml
diff --git a/pmd/src/main/resources/rulesets/java/naming.xml b/pmd-java/src/main/resources/rulesets/java/naming.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/naming.xml
rename to pmd-java/src/main/resources/rulesets/java/naming.xml
diff --git a/pmd/src/main/resources/rulesets/java/optimizations.xml b/pmd-java/src/main/resources/rulesets/java/optimizations.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/optimizations.xml
rename to pmd-java/src/main/resources/rulesets/java/optimizations.xml
diff --git a/pmd/src/main/resources/rulesets/java/rulesets.properties b/pmd-java/src/main/resources/rulesets/java/rulesets.properties
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/rulesets.properties
rename to pmd-java/src/main/resources/rulesets/java/rulesets.properties
diff --git a/pmd/src/main/resources/rulesets/java/strictexception.xml b/pmd-java/src/main/resources/rulesets/java/strictexception.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/strictexception.xml
rename to pmd-java/src/main/resources/rulesets/java/strictexception.xml
diff --git a/pmd/src/main/resources/rulesets/java/strings.xml b/pmd-java/src/main/resources/rulesets/java/strings.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/strings.xml
rename to pmd-java/src/main/resources/rulesets/java/strings.xml
diff --git a/pmd/src/main/resources/rulesets/java/sunsecure.xml b/pmd-java/src/main/resources/rulesets/java/sunsecure.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/sunsecure.xml
rename to pmd-java/src/main/resources/rulesets/java/sunsecure.xml
diff --git a/pmd/src/main/resources/rulesets/java/typeresolution.xml b/pmd-java/src/main/resources/rulesets/java/typeresolution.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/typeresolution.xml
rename to pmd-java/src/main/resources/rulesets/java/typeresolution.xml
diff --git a/pmd/src/main/resources/rulesets/java/unnecessary.xml b/pmd-java/src/main/resources/rulesets/java/unnecessary.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/unnecessary.xml
rename to pmd-java/src/main/resources/rulesets/java/unnecessary.xml
diff --git a/pmd/src/main/resources/rulesets/java/unusedcode.xml b/pmd-java/src/main/resources/rulesets/java/unusedcode.xml
similarity index 100%
rename from pmd/src/main/resources/rulesets/java/unusedcode.xml
rename to pmd-java/src/main/resources/rulesets/java/unusedcode.xml
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ParserTst.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ParserTst.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ParserTst.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ParserTst.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperatorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperatorTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperatorTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAssignmentOperatorTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTTests.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTTests.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTTests.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTTests.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/AccessNodeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/AccessNodeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/AccessNodeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/AccessNodeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ClassDeclTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ClassDeclTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ClassDeclTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ClassDeclTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/FieldDeclTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/FieldDeclTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/FieldDeclTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/FieldDeclTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/MethodDeclTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/MethodDeclTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/MethodDeclTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/MethodDeclTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/SimpleNodeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/AcceptanceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/AcceptanceTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/AcceptanceTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/AcceptanceTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/DAAPathFinderTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/DAAPathFinderTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/DAAPathFinderTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/DAAPathFinderTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/DataFlowNodeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/DataFlowNodeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/DataFlowNodeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/DataFlowNodeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/GeneralFiddlingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/GeneralFiddlingTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/GeneralFiddlingTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/GeneralFiddlingTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinderTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinderTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinderTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinderTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/StructureTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/StructureTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/StructureTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/StructureTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/android/AndroidRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/android/AndroidRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/android/AndroidRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/android/AndroidRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/basic/BasicRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/basic/BasicRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/basic/BasicRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/basic/BasicRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/braces/BracesRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/braces/BracesRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/braces/BracesRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/braces/BracesRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/clone/CloneRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/clone/CloneRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/clone/CloneRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/clone/CloneRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/codesize/CodesizeRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codesize/CodesizeRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/codesize/CodesizeRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codesize/CodesizeRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRuleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRuleTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRuleTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/AbstractCommentRuleTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/comments/CommentRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DesignRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/empty/EmptyRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/empty/EmptyRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/empty/EmptyRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/empty/EmptyRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/finalizers/FinalizersRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/finalizers/FinalizersRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/finalizers/FinalizersRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/finalizers/FinalizersRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/imports/ImportsRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/imports/ImportsRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/imports/ImportsRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/imports/ImportsRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/j2ee/J2EERulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/j2ee/J2EERulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/j2ee/J2EERulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/j2ee/J2EERulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/javabeans/JavabeansRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/javabeans/JavabeansRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/javabeans/JavabeansRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/javabeans/JavabeansRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/junit/JunitRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/junit/JunitRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/junit/JunitRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/junit/JunitRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/LoggingJakartaCommonsRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjava/LoggingJavaRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjava/LoggingJavaRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjava/LoggingJavaRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/loggingjava/LoggingJavaRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/migrating/MigratingRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/migrating/MigratingRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/migrating/MigratingRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/migrating/MigratingRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/naming/NamingRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/optimizations/OptimizationsRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/optimizations/OptimizationsRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/optimizations/OptimizationsRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/optimizations/OptimizationsRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strictexception/StrictExceptionRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRuleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRuleTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRuleTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRuleTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/StringsRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/StringsRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/StringsRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/strings/StringsRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/sunsecure/SunSecureRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/sunsecure/SunSecureRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/sunsecure/SunSecureRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/sunsecure/SunSecureRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/CloneMethodMustImplementCloneableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/CloneMethodMustImplementCloneableTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/CloneMethodMustImplementCloneableTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/CloneMethodMustImplementCloneableTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/LooseCouplingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/LooseCouplingTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/LooseCouplingTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/LooseCouplingTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/SignatureDeclareThrowsExceptionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/SignatureDeclareThrowsExceptionTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/SignatureDeclareThrowsExceptionTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/SignatureDeclareThrowsExceptionTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/UnusedImportsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/UnusedImportsTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/UnusedImportsTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/UnusedImportsTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unnecessary/UnnecessaryRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedCodeRulesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedCodeRulesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedCodeRulesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/UnusedCodeRulesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardGraphInnateFilter_o.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardGraphInnateFilter_o.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardGraphInnateFilter_o.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardGraphInnateFilter_o.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardInnateFilter_o.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardInnateFilter_o.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardInnateFilter_o.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/unusedcode/unusedprivatemethod/DashboardInnateFilter_o.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/AcceptanceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/AcceptanceTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/AcceptanceTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/AcceptanceTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/GlobalScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/GlobalScopeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/GlobalScopeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/GlobalScopeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunctionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunctionTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunctionTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ImageFinderFunctionTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/LocalScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/LocalScopeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/LocalScopeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/LocalScopeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/NameOccurrencesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/NameOccurrencesTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/NameOccurrencesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/NameOccurrencesTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ScopeCreationVisitorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ScopeCreationVisitorTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ScopeCreationVisitorTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ScopeCreationVisitorTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SimpleTypedNameDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/TypeSetTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/TypeSetTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/TypeSetTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/TypeSetTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclarationTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclarationTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclarationTest.java
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java
similarity index 100%
rename from pmd/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases.java b/pmd-java/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases.java
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases.java
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases17.java b/pmd-java/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases17.java
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases17.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases17.java
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases18.java b/pmd-java/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases18.java
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases18.java
rename to pmd-java/src/test/resources/net/sourceforge/pmd/ast/ParserCornerCases18.java
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperFirst.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperFirst.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperFirst.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperFirst.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperLast.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperLast.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperLast.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/CallSuperLast.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/DoNotHardCodeSDCard.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/DoNotHardCodeSDCard.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/DoNotHardCodeSDCard.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/DoNotHardCodeSDCard.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogD.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogD.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogD.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogD.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogV.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogV.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogV.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/android/xml/ProtectLogV.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidBranchingStatementAsLastInLoop.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidBranchingStatementAsLastInLoop.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidBranchingStatementAsLastInLoop.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidBranchingStatementAsLastInLoop.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidDecimalLiteralsInBigDecimalConstructor.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidMultipleUnaryOperators.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidMultipleUnaryOperators.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidMultipleUnaryOperators.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidMultipleUnaryOperators.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidThreadGroup.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidThreadGroup.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidThreadGroup.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidThreadGroup.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingHardCodedIP.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingHardCodedIP.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingHardCodedIP.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingHardCodedIP.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingOctalValues.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingOctalValues.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingOctalValues.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/AvoidUsingOctalValues.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BigIntegerInstantiation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BigIntegerInstantiation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BigIntegerInstantiation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BigIntegerInstantiation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BooleanInstantiation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BooleanInstantiation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BooleanInstantiation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BooleanInstantiation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/BrokenNullCheck.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckResultSet.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckResultSet.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckResultSet.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckResultSet.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckSkipResult.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckSkipResult.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckSkipResult.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CheckSkipResult.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ClassCastExceptionWithToArray.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ClassCastExceptionWithToArray.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ClassCastExceptionWithToArray.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ClassCastExceptionWithToArray.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CollapsibleIfStatements.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CollapsibleIfStatements.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CollapsibleIfStatements.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/CollapsibleIfStatements.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontCallThreadRun.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontCallThreadRun.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontCallThreadRun.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontCallThreadRun.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontUseFloatTypeForLoopIndices.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontUseFloatTypeForLoopIndices.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontUseFloatTypeForLoopIndices.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DontUseFloatTypeForLoopIndices.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DoubleCheckedLocking.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DoubleCheckedLocking.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DoubleCheckedLocking.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/DoubleCheckedLocking.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ExtendsObject.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ExtendsObject.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ExtendsObject.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ExtendsObject.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ForLoopShouldBeWhileLoop.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ForLoopShouldBeWhileLoop.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ForLoopShouldBeWhileLoop.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ForLoopShouldBeWhileLoop.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/JumbledIncrementer.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/JumbledIncrementer.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/JumbledIncrementer.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/JumbledIncrementer.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/MisplacedNullCheck.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/MisplacedNullCheck.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/MisplacedNullCheck.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/MisplacedNullCheck.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/OverrideBothEqualsAndHashcode.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/OverrideBothEqualsAndHashcode.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/OverrideBothEqualsAndHashcode.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/OverrideBothEqualsAndHashcode.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ReturnFromFinallyBlock.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ReturnFromFinallyBlock.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ReturnFromFinallyBlock.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/ReturnFromFinallyBlock.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/UnconditionalIfStatement.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/UnconditionalIfStatement.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/UnconditionalIfStatement.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/basic/xml/UnconditionalIfStatement.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/ForLoopsMustUseBraces.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/ForLoopsMustUseBraces.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/ForLoopsMustUseBraces.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/ForLoopsMustUseBraces.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfElseStmtsMustUseBraces.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfElseStmtsMustUseBraces.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfElseStmtsMustUseBraces.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfElseStmtsMustUseBraces.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfStmtsMustUseBraces.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfStmtsMustUseBraces.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfStmtsMustUseBraces.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/IfStmtsMustUseBraces.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/WhileLoopsMustUseBraces.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/WhileLoopsMustUseBraces.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/WhileLoopsMustUseBraces.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/braces/xml/WhileLoopsMustUseBraces.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneMethodMustImplementCloneable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneMethodMustImplementCloneable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneMethodMustImplementCloneable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneMethodMustImplementCloneable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneThrowsCloneNotSupportedException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneThrowsCloneNotSupportedException.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneThrowsCloneNotSupportedException.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/CloneThrowsCloneNotSupportedException.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/ProperCloneImplementation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/ProperCloneImplementation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/ProperCloneImplementation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/clone/xml/ProperCloneImplementation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/CyclomaticComplexity.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/CyclomaticComplexity.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/CyclomaticComplexity.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/CyclomaticComplexity.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveClassLength.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveClassLength.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveClassLength.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveClassLength.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveMethodLength.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveMethodLength.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveMethodLength.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveMethodLength.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveParameterList.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveParameterList.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveParameterList.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessiveParameterList.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessivePublicCount.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessivePublicCount.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessivePublicCount.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ExcessivePublicCount.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ModifiedCyclomaticComplexity.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ModifiedCyclomaticComplexity.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ModifiedCyclomaticComplexity.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/ModifiedCyclomaticComplexity.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NPathComplexity.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NPathComplexity.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NPathComplexity.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NPathComplexity.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssConstructorCount.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssConstructorCount.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssConstructorCount.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssConstructorCount.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssMethodCount.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssMethodCount.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssMethodCount.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssMethodCount.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssTypeCount.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssTypeCount.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssTypeCount.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/NcssTypeCount.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/StdCyclomaticComplexity.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/StdCyclomaticComplexity.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/StdCyclomaticComplexity.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/StdCyclomaticComplexity.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyFields.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyFields.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyFields.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyFields.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codesize/xml/TooManyMethods.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentContent.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentContent.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentContent.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentContent.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentRequired.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentRequired.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentRequired.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentRequired.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentSize.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentSize.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentSize.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/comments/xml/CommentSize.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AssignmentInOperand.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AssignmentInOperand.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AssignmentInOperand.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AssignmentInOperand.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AtLeastOneConstructor.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AtLeastOneConstructor.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AtLeastOneConstructor.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AtLeastOneConstructor.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidLiteralsInIfCondition.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidLiteralsInIfCondition.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidLiteralsInIfCondition.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidLiteralsInIfCondition.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidPrefixingMethodParameters.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidPrefixingMethodParameters.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidPrefixingMethodParameters.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidPrefixingMethodParameters.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingNativeCode.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingNativeCode.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingNativeCode.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingNativeCode.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingShortType.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingShortType.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingShortType.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingShortType.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingVolatile.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingVolatile.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingVolatile.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidUsingVolatile.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/BooleanInversion.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/BooleanInversion.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/BooleanInversion.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/BooleanInversion.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/CallSuperInConstructor.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/CallSuperInConstructor.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/CallSuperInConstructor.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/CallSuperInConstructor.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DataflowAnomalyAnalysis.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DataflowAnomalyAnalysis.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DataflowAnomalyAnalysis.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DataflowAnomalyAnalysis.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DefaultPackage.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DefaultPackage.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DefaultPackage.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DefaultPackage.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DoNotCallGarbageCollectionExplicitly.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DontImportSun.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DontImportSun.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DontImportSun.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/DontImportSun.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/NullAssignment.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/NullAssignment.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/NullAssignment.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/NullAssignment.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OneDeclarationPerLine.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OneDeclarationPerLine.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OneDeclarationPerLine.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OneDeclarationPerLine.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OnlyOneReturn.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OnlyOneReturn.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OnlyOneReturn.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/OnlyOneReturn.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/SuspiciousOctalEscape.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/SuspiciousOctalEscape.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/SuspiciousOctalEscape.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/SuspiciousOctalEscape.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryConstructor.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryConstructor.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryConstructor.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryConstructor.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryParentheses.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryParentheses.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryParentheses.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UnnecessaryParentheses.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseConcurrentHashMap.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseConcurrentHashMap.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseConcurrentHashMap.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseConcurrentHashMap.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseObjectForClearerAPI.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseObjectForClearerAPI.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseObjectForClearerAPI.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/UseObjectForClearerAPI.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/CouplingBetweenObjects.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/CouplingBetweenObjects.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/CouplingBetweenObjects.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/CouplingBetweenObjects.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/ExcessiveImports.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/ExcessiveImports.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/ExcessiveImports.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/ExcessiveImports.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LawOfDemeter.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LawOfDemeter.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LawOfDemeter.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LawOfDemeter.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LooseCoupling.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LooseCoupling.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LooseCoupling.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LooseCoupling.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LoosePackageCoupling.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LoosePackageCoupling.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LoosePackageCoupling.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/coupling/xml/LoosePackageCoupling.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAbstractMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAbstractMethod.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAbstractMethod.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAbstractMethod.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAnyMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAnyMethod.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAnyMethod.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AbstractClassWithoutAnyMethod.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AccessorClassGeneration.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AssignmentToNonFinalStatic.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AssignmentToNonFinalStatic.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AssignmentToNonFinalStatic.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AssignmentToNonFinalStatic.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidConstantsInterface.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidConstantsInterface.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidConstantsInterface.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidConstantsInterface.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidDeeplyNestedIfStmts.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidDeeplyNestedIfStmts.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidDeeplyNestedIfStmts.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidDeeplyNestedIfStmts.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidInstanceofChecksInCatchClause.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidInstanceofChecksInCatchClause.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidInstanceofChecksInCatchClause.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidInstanceofChecksInCatchClause.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedFieldInFinalClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedFieldInFinalClass.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedFieldInFinalClass.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedFieldInFinalClass.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedMethodInFinalClassNotExtending.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedMethodInFinalClassNotExtending.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedMethodInFinalClassNotExtending.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidProtectedMethodInFinalClassNotExtending.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidReassigningParameters.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidSynchronizedAtMethodLevel.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidSynchronizedAtMethodLevel.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidSynchronizedAtMethodLevel.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/AvoidSynchronizedAtMethodLevel.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/BadComparison.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/BadComparison.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/BadComparison.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/BadComparison.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ClassWithOnlyPrivateConstructorsShouldBeFinal.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CloseResource.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CompareObjectsWithEquals.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CompareObjectsWithEquals.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CompareObjectsWithEquals.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/CompareObjectsWithEquals.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConfusingTernary.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConfusingTernary.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConfusingTernary.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConfusingTernary.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/DefaultLabelNotLastInSwitchStmt.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/DefaultLabelNotLastInSwitchStmt.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/DefaultLabelNotLastInSwitchStmt.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/DefaultLabelNotLastInSwitchStmt.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EmptyMethodInAbstractClassShouldBeAbstract.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EqualsNull.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EqualsNull.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EqualsNull.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/EqualsNull.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FieldDeclarationsShouldBeAtStartOfClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FieldDeclarationsShouldBeAtStartOfClass.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FieldDeclarationsShouldBeAtStartOfClass.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FieldDeclarationsShouldBeAtStartOfClass.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/FinalFieldCouldBeStatic.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/GodClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/GodClass.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/GodClass.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/GodClass.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/IdempotentOperations.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/IdempotentOperations.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/IdempotentOperations.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/IdempotentOperations.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ImmutableField.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/InstantiationToGetClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/InstantiationToGetClass.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/InstantiationToGetClass.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/InstantiationToGetClass.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LogicInversion.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LogicInversion.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LogicInversion.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/LogicInversion.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingBreakInSwitch.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingBreakInSwitch.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingBreakInSwitch.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingBreakInSwitch.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingStaticMethodInNonInstantiatableClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingStaticMethodInNonInstantiatableClass.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingStaticMethodInNonInstantiatableClass.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/MissingStaticMethodInNonInstantiatableClass.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonCaseLabelInSwitchStatement.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonCaseLabelInSwitchStatement.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonCaseLabelInSwitchStatement.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonCaseLabelInSwitchStatement.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonStaticInitializer.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonStaticInitializer.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonStaticInitializer.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonStaticInitializer.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonThreadSafeSingleton.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonThreadSafeSingleton.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonThreadSafeSingleton.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/NonThreadSafeSingleton.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/OptimizableToArrayCall.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/OptimizableToArrayCall.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/OptimizableToArrayCall.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/OptimizableToArrayCall.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInCaseInsensitiveComparisons.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInCaseInsensitiveComparisons.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInCaseInsensitiveComparisons.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInCaseInsensitiveComparisons.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInComparisons.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInComparisons.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInComparisons.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionLiteralsFirstInComparisons.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionalIteratorRule.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionalIteratorRule.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionalIteratorRule.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PositionalIteratorRule.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PreserveStackTrace.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PreserveStackTrace.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PreserveStackTrace.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/PreserveStackTrace.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ReturnEmptyArrayRatherThanNull.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ReturnEmptyArrayRatherThanNull.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ReturnEmptyArrayRatherThanNull.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ReturnEmptyArrayRatherThanNull.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimpleDateFormatNeedsLocale.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanExpressions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanExpressions.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanExpressions.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanExpressions.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanReturns.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanReturns.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanReturns.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyBooleanReturns.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyConditional.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyConditional.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyConditional.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SimplifyConditional.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingularField.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingularField.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingularField.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SingularField.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchDensity.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchDensity.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchDensity.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchDensity.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchStmtsShouldHaveDefault.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchStmtsShouldHaveDefault.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchStmtsShouldHaveDefault.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/SwitchStmtsShouldHaveDefault.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooFewBranchesForASwitchStatement.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooFewBranchesForASwitchStatement.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooFewBranchesForASwitchStatement.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooFewBranchesForASwitchStatement.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooManyHttpFilter.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooManyHttpFilter.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooManyHttpFilter.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/TooManyHttpFilter.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyConstructor.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyConstructor.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyConstructor.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyConstructor.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyMethod.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyMethod.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UncommentedEmptyMethod.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnnecessaryLocalBeforeReturn.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnnecessaryLocalBeforeReturn.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnnecessaryLocalBeforeReturn.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnnecessaryLocalBeforeReturn.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnsynchronizedStaticDateFormatter.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnsynchronizedStaticDateFormatter.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnsynchronizedStaticDateFormatter.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UnsynchronizedStaticDateFormatter.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseCollectionIsEmpty.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseCollectionIsEmpty.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseCollectionIsEmpty.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseCollectionIsEmpty.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseLocaleWithCaseConversions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseLocaleWithCaseConversions.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseLocaleWithCaseConversions.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseLocaleWithCaseConversions.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseNotifyAllInsteadOfNotify.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseNotifyAllInsteadOfNotify.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseNotifyAllInsteadOfNotify.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseNotifyAllInsteadOfNotify.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseUtilityClass.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseVarargs.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyCatchBlock.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyCatchBlock.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyCatchBlock.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyCatchBlock.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyFinallyBlock.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyFinallyBlock.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyFinallyBlock.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyFinallyBlock.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyIfStmt.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyIfStmt.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyIfStmt.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyIfStmt.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyInitializer.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyInitializer.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyInitializer.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyInitializer.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementBlock.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementBlock.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementBlock.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementBlock.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementNotInLoop.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementNotInLoop.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementNotInLoop.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStatementNotInLoop.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStaticInitializer.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStaticInitializer.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStaticInitializer.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyStaticInitializer.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySwitchStatements.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySwitchStatements.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySwitchStatements.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySwitchStatements.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySynchronizedBlock.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySynchronizedBlock.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySynchronizedBlock.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptySynchronizedBlock.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyTryBlock.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyTryBlock.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyTryBlock.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyTryBlock.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyWhileStmt.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyWhileStmt.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyWhileStmt.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/empty/xml/EmptyWhileStmt.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/AvoidCallingFinalize.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/AvoidCallingFinalize.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/AvoidCallingFinalize.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/AvoidCallingFinalize.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/EmptyFinalizer.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/EmptyFinalizer.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/EmptyFinalizer.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/EmptyFinalizer.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeDoesNotCallSuperFinalize.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOnlyCallsSuperFinalize.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOverloaded.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOverloaded.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOverloaded.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeOverloaded.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeShouldBeProtected.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeShouldBeProtected.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeShouldBeProtected.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/finalizers/xml/FinalizeShouldBeProtected.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DontImportJavaLang.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DontImportJavaLang.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DontImportJavaLang.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DontImportJavaLang.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DuplicateImports.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DuplicateImports.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DuplicateImports.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/DuplicateImports.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/ImportFromSamePackage.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/ImportFromSamePackage.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/ImportFromSamePackage.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/ImportFromSamePackage.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/TooManyStaticImports.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/TooManyStaticImports.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/TooManyStaticImports.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/TooManyStaticImports.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnnecessaryFullyQualifiedName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnnecessaryFullyQualifiedName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnnecessaryFullyQualifiedName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnnecessaryFullyQualifiedName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnusedImports.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnusedImports.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnusedImports.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/imports/xml/UnusedImports.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotCallSystemExit.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotCallSystemExit.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotCallSystemExit.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotCallSystemExit.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotUseThreads.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotUseThreads.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotUseThreads.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/DoNotUseThreads.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalHomeNamingConvention.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalHomeNamingConvention.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalHomeNamingConvention.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalHomeNamingConvention.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalInterfaceSessionNamingConvention.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalInterfaceSessionNamingConvention.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalInterfaceSessionNamingConvention.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/LocalInterfaceSessionNamingConvention.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/MDBAndSessionBeanNamingConvention.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/MDBAndSessionBeanNamingConvention.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/MDBAndSessionBeanNamingConvention.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/MDBAndSessionBeanNamingConvention.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteInterfaceNamingConvention.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteInterfaceNamingConvention.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteInterfaceNamingConvention.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteInterfaceNamingConvention.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/RemoteSessionInterfaceNamingConvention.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/StaticEJBFieldShouldBeFinal.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/StaticEJBFieldShouldBeFinal.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/StaticEJBFieldShouldBeFinal.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/StaticEJBFieldShouldBeFinal.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/UseProperClassLoader.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/UseProperClassLoader.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/UseProperClassLoader.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/j2ee/xml/UseProperClassLoader.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/BeanMembersShouldSerialize.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/BeanMembersShouldSerialize.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/BeanMembersShouldSerialize.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/BeanMembersShouldSerialize.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/MissingSerialVersionUID.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/MissingSerialVersionUID.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/MissingSerialVersionUID.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/javabeans/xml/MissingSerialVersionUID.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitSpelling.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitStaticSuite.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestContainsTooManyAsserts.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestContainsTooManyAsserts.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestContainsTooManyAsserts.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestContainsTooManyAsserts.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitTestsShouldIncludeAssert.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/SimplifyBooleanAssertion.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/SimplifyBooleanAssertion.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/SimplifyBooleanAssertion.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/SimplifyBooleanAssertion.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/TestClassWithoutTestCases.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/TestClassWithoutTestCases.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/TestClassWithoutTestCases.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/TestClassWithoutTestCases.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UnnecessaryBooleanAssertion.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UnnecessaryBooleanAssertion.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UnnecessaryBooleanAssertion.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UnnecessaryBooleanAssertion.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertEqualsInsteadOfAssertTrue.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertNullInsteadOfAssertTrue.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertNullInsteadOfAssertTrue.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertNullInsteadOfAssertTrue.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertNullInsteadOfAssertTrue.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertSameInsteadOfAssertTrue.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertSameInsteadOfAssertTrue.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertSameInsteadOfAssertTrue.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertSameInsteadOfAssertTrue.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertTrueInsteadOfAssertEquals.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertTrueInsteadOfAssertEquals.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertTrueInsteadOfAssertEquals.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/UseAssertTrueInsteadOfAssertEquals.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardDebugLogging.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardDebugLogging.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardDebugLogging.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardDebugLogging.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardLogStatement.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardLogStatement.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardLogStatement.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/GuardLogStatement.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/ProperLogger.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjakartacommons/xml/UseCorrectExceptionLogging.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/AvoidPrintStackTrace.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/AvoidPrintStackTrace.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/AvoidPrintStackTrace.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/AvoidPrintStackTrace.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/GuardLogStatementJavaUtil.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/GuardLogStatementJavaUtil.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/GuardLogStatementJavaUtil.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/GuardLogStatementJavaUtil.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/LoggerIsNotStaticFinal.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/LoggerIsNotStaticFinal.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/LoggerIsNotStaticFinal.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/LoggerIsNotStaticFinal.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/MoreThanOneLogger.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/MoreThanOneLogger.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/MoreThanOneLogger.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/MoreThanOneLogger.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/SystemPrintln.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/SystemPrintln.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/SystemPrintln.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/loggingjava/xml/SystemPrintln.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidAssertAsIdentifier.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidAssertAsIdentifier.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidAssertAsIdentifier.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidAssertAsIdentifier.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidEnumAsIdentifier.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidEnumAsIdentifier.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidEnumAsIdentifier.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/AvoidEnumAsIdentifier.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ByteInstantiation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ByteInstantiation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ByteInstantiation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ByteInstantiation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/IntegerInstantiation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/IntegerInstantiation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/IntegerInstantiation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/IntegerInstantiation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4SuitesShouldUseSuiteAnnotation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseAfterAnnotation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseBeforeAnnotation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnit4TestShouldUseTestAnnotation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnitUseExpected.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnitUseExpected.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnitUseExpected.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/JUnitUseExpected.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/LongInstantiation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/LongInstantiation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/LongInstantiation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/LongInstantiation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceEnumerationWithIterator.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceEnumerationWithIterator.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceEnumerationWithIterator.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceEnumerationWithIterator.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceHashtableWithMap.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceHashtableWithMap.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceHashtableWithMap.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceHashtableWithMap.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceVectorWithList.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceVectorWithList.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceVectorWithList.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ReplaceVectorWithList.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ShortInstantiation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ShortInstantiation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ShortInstantiation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/migrating/xml/ShortInstantiation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AbstractNaming.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AbstractNaming.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AbstractNaming.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AbstractNaming.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidDollarSigns.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidDollarSigns.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidDollarSigns.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidDollarSigns.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingMethodName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingMethodName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingMethodName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingMethodName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingTypeName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingTypeName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingTypeName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/AvoidFieldNameMatchingTypeName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/BooleanGetMethodName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/BooleanGetMethodName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/BooleanGetMethodName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/BooleanGetMethodName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ClassNamingConventions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ClassNamingConventions.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ClassNamingConventions.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ClassNamingConventions.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/GenericsNaming.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/LongVariable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/LongVariable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/LongVariable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/LongVariable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodNamingConventions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodNamingConventions.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodNamingConventions.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodNamingConventions.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodWithSameNameAsEnclosingClass.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodWithSameNameAsEnclosingClass.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodWithSameNameAsEnclosingClass.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MethodWithSameNameAsEnclosingClass.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MisleadingVariableName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MisleadingVariableName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MisleadingVariableName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/MisleadingVariableName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/NoPackage.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/NoPackage.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/NoPackage.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/NoPackage.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/PackageCase.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/PackageCase.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/PackageCase.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/PackageCase.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortClassName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortClassName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortClassName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortClassName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortMethodName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortMethodName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortMethodName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortMethodName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortVariable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortVariable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortVariable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/ShortVariable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousConstantFieldName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousConstantFieldName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousConstantFieldName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousConstantFieldName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousEqualsMethodName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousEqualsMethodName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousEqualsMethodName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousEqualsMethodName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousHashcodeMethodName.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousHashcodeMethodName.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousHashcodeMethodName.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/SuspiciousHashcodeMethodName.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/VariableNamingConventions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/VariableNamingConventions.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/VariableNamingConventions.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/naming/xml/VariableNamingConventions.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AddEmptyString.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AddEmptyString.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AddEmptyString.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AddEmptyString.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidArrayLoops.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidArrayLoops.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidArrayLoops.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidArrayLoops.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/AvoidInstantiatingObjectsInLoops.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/LocalVariableCouldBeFinal.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/LocalVariableCouldBeFinal.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/LocalVariableCouldBeFinal.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/LocalVariableCouldBeFinal.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/MethodArgumentCouldBeFinal.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/MethodArgumentCouldBeFinal.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/MethodArgumentCouldBeFinal.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/MethodArgumentCouldBeFinal.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/PrematureDeclaration.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/PrematureDeclaration.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/PrematureDeclaration.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/PrematureDeclaration.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/RedundantFieldInitializer.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/RedundantFieldInitializer.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/RedundantFieldInitializer.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/RedundantFieldInitializer.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/SimplifyStartsWith.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UnnecessaryWrapperObjectCreation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UnnecessaryWrapperObjectCreation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UnnecessaryWrapperObjectCreation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UnnecessaryWrapperObjectCreation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArrayListInsteadOfVector.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArrayListInsteadOfVector.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArrayListInsteadOfVector.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArrayListInsteadOfVector.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArraysAsList.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArraysAsList.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArraysAsList.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseArraysAsList.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseStringBufferForStringAppends.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseStringBufferForStringAppends.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseStringBufferForStringAppends.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/optimizations/xml/UseStringBufferForStringAppends.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingGenericException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingGenericException.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingGenericException.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingGenericException.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingNPE.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingNPE.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingNPE.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingNPE.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingThrowable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingThrowable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingThrowable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidCatchingThrowable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidLosingExceptionInformation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidLosingExceptionInformation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidLosingExceptionInformation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidLosingExceptionInformation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidRethrowingException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidRethrowingException.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidRethrowingException.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidRethrowingException.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNewInstanceOfSameException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNewInstanceOfSameException.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNewInstanceOfSameException.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNewInstanceOfSameException.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNullPointerException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNullPointerException.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNullPointerException.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingNullPointerException.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingRawExceptionTypes.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingRawExceptionTypes.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingRawExceptionTypes.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/AvoidThrowingRawExceptionTypes.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotExtendJavaLangError.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotExtendJavaLangError.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotExtendJavaLangError.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotExtendJavaLangError.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotThrowExceptionInFinally.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotThrowExceptionInFinally.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotThrowExceptionInFinally.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/DoNotThrowExceptionInFinally.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/ExceptionAsFlowControl.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/ExceptionAsFlowControl.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/ExceptionAsFlowControl.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/ExceptionAsFlowControl.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/SignatureDeclareThrowsException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/SignatureDeclareThrowsException.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/SignatureDeclareThrowsException.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strictexception/xml/SignatureDeclareThrowsException.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AppendCharacterWithChar.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AppendCharacterWithChar.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AppendCharacterWithChar.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AppendCharacterWithChar.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidDuplicateLiterals.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidDuplicateLiterals.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidDuplicateLiterals.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidDuplicateLiterals.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidStringBufferField.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidStringBufferField.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidStringBufferField.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/AvoidStringBufferField.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveAppendsShouldReuse.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveAppendsShouldReuse.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveAppendsShouldReuse.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveAppendsShouldReuse.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveLiteralAppends.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveLiteralAppends.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveLiteralAppends.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/ConsecutiveLiteralAppends.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientEmptyStringCheck.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientEmptyStringCheck.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientEmptyStringCheck.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientEmptyStringCheck.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientStringBuffering.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientStringBuffering.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientStringBuffering.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InefficientStringBuffering.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InsufficientStringBufferDeclaration.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InsufficientStringBufferDeclaration.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InsufficientStringBufferDeclaration.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/InsufficientStringBufferDeclaration.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringBufferInstantiationWithChar.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringBufferInstantiationWithChar.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringBufferInstantiationWithChar.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringBufferInstantiationWithChar.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringInstantiation.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringInstantiation.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringInstantiation.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringInstantiation.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringToString.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringToString.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringToString.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/StringToString.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UnnecessaryCaseChange.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UnnecessaryCaseChange.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UnnecessaryCaseChange.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UnnecessaryCaseChange.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseEqualsToCompareStrings.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseEqualsToCompareStrings.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseEqualsToCompareStrings.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseEqualsToCompareStrings.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseIndexOfChar.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseIndexOfChar.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseIndexOfChar.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseIndexOfChar.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseStringBufferLength.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseStringBufferLength.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseStringBufferLength.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UseStringBufferLength.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/strings/xml/UselessStringValueOf.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/ArrayIsStoredDirectly.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/ArrayIsStoredDirectly.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/ArrayIsStoredDirectly.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/ArrayIsStoredDirectly.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/sunsecure/xml/MethodReturnsInternalArray.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/CloneMethodMustImplementCloneable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/CloneMethodMustImplementCloneable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/CloneMethodMustImplementCloneable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/CloneMethodMustImplementCloneable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/LooseCoupling.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/LooseCoupling.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/LooseCoupling.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/LooseCoupling.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/SignatureDeclareThrowsException.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/SignatureDeclareThrowsException.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/SignatureDeclareThrowsException.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/SignatureDeclareThrowsException.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/UnusedImports.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/UnusedImports.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/UnusedImports.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/UnusedImports.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryConversionTemporary.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryConversionTemporary.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryConversionTemporary.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryConversionTemporary.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryFinalModifier.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryFinalModifier.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryFinalModifier.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryFinalModifier.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryReturn.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryReturn.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryReturn.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryReturn.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnusedNullCheckInEquals.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnusedNullCheckInEquals.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnusedNullCheckInEquals.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnusedNullCheckInEquals.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOperationOnImmutable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOperationOnImmutable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOperationOnImmutable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOperationOnImmutable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOverridingMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOverridingMethod.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOverridingMethod.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessOverridingMethod.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedFormalParameter.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedFormalParameter.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedFormalParameter.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedFormalParameter.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedLocalVariable.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedLocalVariable.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedLocalVariable.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedLocalVariable.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedModifier.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedModifier.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedModifier.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedModifier.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateField.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateField.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateField.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateField.xml
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml
similarity index 100%
rename from pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unusedcode/xml/UnusedPrivateMethod.xml
diff --git a/pmd/src/main/ant/alljavacc.xml b/pmd/src/main/ant/alljavacc.xml
index f8307b38bd..7b30050e7a 100644
--- a/pmd/src/main/ant/alljavacc.xml
+++ b/pmd/src/main/ant/alljavacc.xml
@@ -4,7 +4,7 @@
 
     <target name="alljavacc"
             description="Generates all JavaCC aspects within PMD"
-            depends="checkUpToDate,init,dummyjjtree,javajjtree,jspjjtree,cppjavacc,plsqljjtree,vmjjtree,cleanup" />
+            depends="checkUpToDate,init,dummyjjtree,jspjjtree,cppjavacc,plsqljjtree,vmjjtree,cleanup" />
 
     <target name="checkUpToDate">
         <uptodate property="javaccBuildNotRequired" targetfile="${target}/last-generated-timestamp">
@@ -102,70 +102,6 @@
 
     </target>
 
-    <target name="javajjtree" description="Generates the Java parser and AST source files" unless="javaccBuildNotRequired">
-        <delete dir="${target}/net/sourceforge/pmd/lang/java/ast" />
-        <mkdir dir="${target}/net/sourceforge/pmd/lang/java/ast" />
-        <jjtree target="etc/grammar/Java.jjt"
-                outputdirectory="${target}/net/sourceforge/pmd/lang/java/ast"
-                javacchome="${javacc-home.path}" />
-        <!-- Ensure generated using CharStream interface -->
-        <javacc static="false"
-                usercharstream="true"
-                target="${target}/net/sourceforge/pmd/lang/java/ast/Java.jj"
-                outputdirectory="${target}/net/sourceforge/pmd/lang/java/ast"
-                javacchome="${javacc-home.path}" />
-        <delete file="${target}/net/sourceforge/pmd/lang/java/ast/Node.java" />
-        <delete file="${target}/net/sourceforge/pmd/lang/java/ast/SimpleNode.java" />
-        <delete file="${target}/net/sourceforge/pmd/lang/java/ast/CharStream.java" />
-        <delete file="${target}/net/sourceforge/pmd/lang/java/ast/TokenMgrError.java" />
-
-        <replace file="${target}/net/sourceforge/pmd/lang/java/ast/JavaParserTokenManager.java"
-                 token="class JavaParserTokenManager"
-                 value="class JavaParserTokenManager extends net.sourceforge.pmd.lang.ast.AbstractTokenManager" />
-        <replace file="${target}/net/sourceforge/pmd/lang/java/ast/JavaParser.java"
-                 token="throw new Error"
-                 value="throw new RuntimeException" />
-        <replace file="${target}/net/sourceforge/pmd/lang/java/ast/ParseException.java"
-                 token="extends Exception"
-                 value="extends net.sourceforge.pmd.lang.ast.ParseException" />
-        <replace file="${target}/net/sourceforge/pmd/lang/java/ast/JavaParserVisitor.java"
-                 token="SimpleNode"
-                 value="JavaNode" />
-        <replace file="${target}/net/sourceforge/pmd/lang/java/ast/JJTJavaParserState.java">
-            <replacetoken>public class</replacetoken>
-            <replacevalue><![CDATA[import net.sourceforge.pmd.lang.ast.Node;
-
-public class]]></replacevalue>
-        </replace>
-        <replace file="${target}/net/sourceforge/pmd/lang/java/ast/Token.java">
-            <replacetoken><![CDATA[      default : return new Token(ofKind, image);
-    }
-  }
-]]></replacetoken>
-            <replacevalue><![CDATA[      case JavaParserConstants.RUNSIGNEDSHIFT :
-      case JavaParserConstants.RSIGNEDSHIFT :
-      case JavaParserConstants.GT:
-        return new GTToken(ofKind, image);
-      default : return new Token(ofKind, image);
-    }
-  }
-
-  public static final class GTToken extends Token {
-    public int realKind = JavaParserConstants.GT;
-    public GTToken(int ofKind, String image) {
-       super(ofKind, image);
-    }
-  }
-]]></replacevalue>
-        </replace>
-
-        <delete>
-            <fileset dir="${target}/net/sourceforge/pmd/lang/java/ast">
-                <include name="AST*.java" />
-            </fileset>
-        </delete>
-    </target>
-
     <target name="plsqljjtree" description="Generates the PlSQL parser and AST source files" unless="javaccBuildNotRequired">
         <delete dir="${target}/net/sourceforge/pmd/lang/plsql/ast" />
         <mkdir dir="${target}/net/sourceforge/pmd/lang/plsql/ast" />
diff --git a/pmd/src/main/java/net/sourceforge/pmd/PMDConfiguration.java b/pmd/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
index 01224a3c3e..a0cedbcc16 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/PMDConfiguration.java
@@ -11,7 +11,6 @@ import java.util.Properties;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.renderers.RendererFactory;
 import net.sourceforge.pmd.util.ClasspathClassLoader;
@@ -245,7 +244,7 @@ public class PMDConfiguration extends AbstractConfiguration {
         if (languageVersion == null) {
             // For compatibility with older code that does not always pass in
             // a correct filename.
-            languageVersion = languageVersionDiscoverer.getDefaultLanguageVersion(LanguageRegistry.getLanguage(JavaLanguageModule.NAME));
+            languageVersion = languageVersionDiscoverer.getDefaultLanguageVersion(LanguageRegistry.getLanguage("Java"));
         }
         return languageVersion;
     }
diff --git a/pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java b/pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java
index b4049bf4ee..2629f6d61c 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java
@@ -23,8 +23,11 @@ import net.sourceforge.pmd.RuleSetFactory;
 import net.sourceforge.pmd.RuleSetNotFoundException;
 import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.SourceCodeProcessor;
-import net.sourceforge.pmd.lang.*;
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
+import net.sourceforge.pmd.lang.Language;
+import net.sourceforge.pmd.lang.LanguageFilenameFilter;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.Parser;
 import net.sourceforge.pmd.util.FileUtil;
 import net.sourceforge.pmd.util.StringUtil;
 import net.sourceforge.pmd.util.datasource.DataSource;
@@ -77,7 +80,7 @@ public class Benchmarker {
     public static void main(String[] args) throws RuleSetNotFoundException, IOException, PMDException {
 
         String targetjdk = findOptionalStringValue(args, "--targetjdk", "1.4");
-        Language language = LanguageRegistry.getLanguage(JavaLanguageModule.NAME);
+        Language language = LanguageRegistry.getLanguage("Java");
         LanguageVersion languageVersion = language.getVersion(targetjdk);
         if (languageVersion == null) {
         	languageVersion = language.getDefaultVersion();
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java b/pmd/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java
index 10d27040cc..14bcf7106d 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cli/XPathCLI.java
@@ -17,7 +17,6 @@ import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.SourceCodeProcessor;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageRegistry;
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
 import net.sourceforge.pmd.lang.rule.XPathRule;
 import net.sourceforge.pmd.util.StringUtil;
 
@@ -34,7 +33,7 @@ import net.sourceforge.pmd.util.StringUtil;
  */
 public class XPathCLI {
 
-    private static final Language LANGUAGE = LanguageRegistry.getLanguage(JavaLanguageModule.NAME);
+    private static final Language LANGUAGE = LanguageRegistry.getLanguage("Java");
 
     public static void main(String[] args) throws Exception {
         if (args.length != 4) {
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java
index fb558cbeef..027a3aa48f 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDConfiguration.java
@@ -5,6 +5,7 @@ package net.sourceforge.pmd.cpd;
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.Reader;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
@@ -15,7 +16,6 @@ import net.sourceforge.pmd.util.FileFinder;
 
 import com.beust.jcommander.IStringConverter;
 import com.beust.jcommander.Parameter;
-import java.io.Reader;
 
 /**
  *
@@ -156,19 +156,19 @@ public class CPDConfiguration extends AbstractConfiguration {
 	public static void setSystemProperties(CPDConfiguration configuration) {
 		Properties properties = System.getProperties();
 		if (configuration.isIgnoreLiterals()) {
-			properties.setProperty(JavaTokenizer.IGNORE_LITERALS, "true");
+			properties.setProperty(Tokenizer.IGNORE_LITERALS, "true");
 		} else {
-		    properties.remove(JavaTokenizer.IGNORE_LITERALS);
+		    properties.remove(Tokenizer.IGNORE_LITERALS);
 		}
 		if (configuration.isIgnoreIdentifiers()) {
-			properties.setProperty(JavaTokenizer.IGNORE_IDENTIFIERS, "true");
+			properties.setProperty(Tokenizer.IGNORE_IDENTIFIERS, "true");
         } else {
-            properties.remove(JavaTokenizer.IGNORE_IDENTIFIERS);
+            properties.remove(Tokenizer.IGNORE_IDENTIFIERS);
 		}
 		if (configuration.isIgnoreAnnotations()) {
-			properties.setProperty(JavaTokenizer.IGNORE_ANNOTATIONS, "true");
+			properties.setProperty(Tokenizer.IGNORE_ANNOTATIONS, "true");
         } else {
-            properties.remove(JavaTokenizer.IGNORE_ANNOTATIONS);
+            properties.remove(Tokenizer.IGNORE_ANNOTATIONS);
 		}
 		System.setProperties(properties);
 		configuration.getLanguage().setProperties(properties);
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java
index 3bd2a02bdf..d3e6022177 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/CPDTask.java
@@ -3,6 +3,12 @@
  */
 package net.sourceforge.pmd.cpd;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
@@ -10,12 +16,6 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
 /**
  * CPDTask
  * <p/>
@@ -88,13 +88,13 @@ public class CPDTask extends Task {
     private Language createLanguage() {
         Properties p = new Properties();
         if (ignoreLiterals) {
-            p.setProperty(JavaTokenizer.IGNORE_LITERALS, "true");
+            p.setProperty(Tokenizer.IGNORE_LITERALS, "true");
         }
         if (ignoreIdentifiers) {
-            p.setProperty(JavaTokenizer.IGNORE_IDENTIFIERS, "true");
+            p.setProperty(Tokenizer.IGNORE_IDENTIFIERS, "true");
         }
         if (ignoreAnnotations) {
-            p.setProperty(JavaTokenizer.IGNORE_ANNOTATIONS, "true");
+            p.setProperty(Tokenizer.IGNORE_ANNOTATIONS, "true");
         }
         return new LanguageFactory().createLanguage(language, p);
     }
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java
index 96380f2731..e0d6fc9e68 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java
@@ -6,5 +6,9 @@ package net.sourceforge.pmd.cpd;
 import java.io.IOException;
 
 public interface Tokenizer {
+    String IGNORE_LITERALS = "ignore_literals";
+    String IGNORE_IDENTIFIERS = "ignore_identifiers";
+    String IGNORE_ANNOTATIONS = "ignore_annotations";
+
     void tokenize(SourceCode sourceCode, Tokens tokenEntries) throws IOException;
 }
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java b/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java
index 67e1ed6736..1ea3478353 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/LanguageRegistry.java
@@ -3,9 +3,12 @@
  */
 package net.sourceforge.pmd.lang;
 
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
 
 /**
  * Created by christoferdutz on 20.09.14.
@@ -40,7 +43,7 @@ public class LanguageRegistry {
     }
 
     public static Language getDefaultLanguage() {
-        return getLanguage(JavaLanguageModule.NAME);
+        return getLanguage("Java");
     }
 
     public static Language findLanguageByTerseName(String terseName) {
diff --git a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java b/pmd/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java
index d9a7a14299..069d00af66 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java
@@ -9,7 +9,6 @@ import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RulePriority;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
 
 /**
  * This is a Rule implementation which can be used in scenarios where an actual
@@ -21,7 +20,7 @@ public class MockRule extends AbstractRule {
 
     public MockRule() {
 	super();
-	setLanguage(LanguageRegistry.getLanguage(JavaLanguageModule.NAME));
+	setLanguage(LanguageRegistry.getLanguage("Java"));
     }
 
     public MockRule(String name, String description, String message, String ruleSetName, RulePriority priority) {
@@ -31,7 +30,7 @@ public class MockRule extends AbstractRule {
 
     public MockRule(String name, String description, String message, String ruleSetName) {
 	super();
-	setLanguage(LanguageRegistry.getLanguage(JavaLanguageModule.NAME));
+	setLanguage(LanguageRegistry.getLanguage("Java"));
 	setName(name);
 	setDescription(description);
 	setMessage(message);
diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/designer/Designer.java b/pmd/src/main/java/net/sourceforge/pmd/util/designer/Designer.java
index 7cdd2d151c..f147d4c1d1 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/util/designer/Designer.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/util/designer/Designer.java
@@ -96,14 +96,16 @@ import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.SourceCodeProcessor;
-import net.sourceforge.pmd.lang.*;
+import net.sourceforge.pmd.lang.LanguageRegistry;
+import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.LanguageVersionHandler;
+import net.sourceforge.pmd.lang.Parser;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.ParseException;
 import net.sourceforge.pmd.lang.ast.xpath.Attribute;
 import net.sourceforge.pmd.lang.ast.xpath.AttributeAxisIterator;
 import net.sourceforge.pmd.lang.dfa.DFAGraphMethod;
 import net.sourceforge.pmd.lang.dfa.DFAGraphRule;
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
 import net.sourceforge.pmd.lang.rule.XPathRule;
 import net.sourceforge.pmd.lang.symboltable.NameDeclaration;
 import net.sourceforge.pmd.lang.symboltable.NameOccurrence;
@@ -120,7 +122,7 @@ import org.xml.sax.SAXException;
 public class Designer implements ClipboardOwner {
 
 	private static final int DEFAULT_LANGUAGE_VERSION_SELECTION_INDEX = Arrays.asList(getSupportedLanguageVersions())
-	.indexOf(LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getDefaultVersion());
+	.indexOf(LanguageRegistry.getLanguage("Java").getDefaultVersion());
 
     private Node getCompilationUnit() {
         LanguageVersionHandler languageVersionHandler = getLanguageVersionHandler();
diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java b/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java
index f9332c0b69..49289a1649 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/util/viewer/gui/MainFrame.java
@@ -23,7 +23,6 @@ import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.ast.ParseException;
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
 import net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule;
 import net.sourceforge.pmd.util.viewer.model.ViewerModel;
 import net.sourceforge.pmd.util.viewer.model.ViewerModelEvent;
@@ -126,20 +125,22 @@ public class MainFrame
     }
 
     private LanguageVersion getLanguageVersion() {
+        String javaName = "Java";
+
         if (jdk14MenuItem.isSelected()) {
-            return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.4");
+            return LanguageRegistry.getLanguage(javaName).getVersion("1.4");
         } else if (jdk13MenuItem.isSelected()) {
-            return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.3");
+            return LanguageRegistry.getLanguage(javaName).getVersion("1.3");
         } else if (jdk15MenuItem.isSelected()) {
-            return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.5");
+            return LanguageRegistry.getLanguage(javaName).getVersion("1.5");
         } else if (jdk16MenuItem.isSelected()) {
-            return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.6");
+            return LanguageRegistry.getLanguage(javaName).getVersion("1.6");
         } else if (jdk17MenuItem.isSelected()) {
-            return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.7");
+            return LanguageRegistry.getLanguage(javaName).getVersion("1.7");
         } else if (plsqlMenuItem.isSelected()) {
             return LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion();
         }
-        return LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.5");
+        return LanguageRegistry.getLanguage(javaName).getVersion("1.5");
     }
 
     /**
diff --git a/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
index a90ed38432..277ea304a4 100644
--- a/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
+++ b/pmd/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
@@ -1,7 +1,6 @@
 net.sourceforge.pmd.lang.cpp.CppLanguageModule
 net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule
 net.sourceforge.pmd.lang.fortran.FortranLanguageModule
-net.sourceforge.pmd.lang.java.JavaLanguageModule
 net.sourceforge.pmd.lang.jsp.JspLanguageModule
 net.sourceforge.pmd.lang.php.PhpLanguageModule
 net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule
diff --git a/pmd/src/test/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd/src/test/java/net/sourceforge/pmd/testframework/RuleTst.java
index f580d444e6..67fe9aafbf 100644
--- a/pmd/src/test/java/net/sourceforge/pmd/testframework/RuleTst.java
+++ b/pmd/src/test/java/net/sourceforge/pmd/testframework/RuleTst.java
@@ -35,7 +35,6 @@ import net.sourceforge.pmd.RuleViolation;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersion;
-import net.sourceforge.pmd.lang.java.JavaLanguageModule;
 import net.sourceforge.pmd.renderers.TextRenderer;
 
 import org.w3c.dom.Document;
@@ -47,7 +46,7 @@ import org.xml.sax.SAXException;
  * Advanced methods for test cases
  */
 public abstract class RuleTst {
-    public static final LanguageVersion DEFAULT_LANGUAGE_VERSION = LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.5");
+    public static final LanguageVersion DEFAULT_LANGUAGE_VERSION = LanguageRegistry.getLanguage("Java").getVersion("1.5");
     public static final Language DEFAULT_LANGUAGE = DEFAULT_LANGUAGE_VERSION.getLanguage();
 
     /**