diff --git a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
index 1a02d6ca6a..8d1344ceb2 100644
--- a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
+++ b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset xmlns="http://pmd.sourceforge.net/ruleset/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Default ruleset used by the CodeClimate Engine for Salesforce.com Apex" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
    <description>Default ruleset used by the Code Climate Engine for Salesforce.com Apex</description>
-   
+
    <!-- COMPLEXITY -->
-   <rule ref="rulesets/apex/complexity.xml/ExcessiveClassLength" message="Avoid really long classes (lines of code)">
+   <rule ref="category/apex/design.xml/ExcessiveClassLength" message="Avoid really long classes (lines of code)">
       <priority>3</priority>
       <properties>
          <property name="minimum" value="1000" />
@@ -13,7 +13,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/ExcessiveParameterList" message="Avoid long parameter lists">
+   <rule ref="category/apex/design.xml/ExcessiveParameterList" message="Avoid long parameter lists">
       <priority>3</priority>
       <properties>
          <property name="minimum" value="4" />
@@ -23,7 +23,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/ExcessivePublicCount" message="This class has too many public methods and attributes">
+   <rule ref="category/apex/design.xml/ExcessivePublicCount" message="This class has too many public methods and attributes">
       <priority>3</priority>
       <properties>
          <property name="minimum" value="25" />
@@ -33,7 +33,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/NcssConstructorCount" message="The constructor has an NCSS line count of {0}">
+   <rule ref="category/apex/design.xml/NcssConstructorCount" message="The constructor has an NCSS line count of {0}">
       <priority>3</priority>
       <properties>
          <property name="minimum" value="20" />
@@ -43,7 +43,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/NcssMethodCount" message="The method {0}() has an NCSS line count of {1}">
+   <rule ref="category/apex/design.xml/NcssMethodCount" message="The method {0}() has an NCSS line count of {1}">
       <priority>3</priority>
       <properties>
          <property name="minimum" value="60" />
@@ -53,7 +53,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/NcssTypeCount" message="The type has an NCSS line count of {0}">
+   <rule ref="category/apex/design.xml/NcssTypeCount" message="The type has an NCSS line count of {0}">
       <priority>3</priority>
       <properties>
          <property name="minimum" value="700" />
@@ -63,7 +63,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/StdCyclomaticComplexity" message="The {0} ''{1}'' has a Standard Cyclomatic Complexity of {2}.">
+   <rule ref="category/apex/design.xml/StdCyclomaticComplexity" message="The {0} ''{1}'' has a Standard Cyclomatic Complexity of {2}.">
       <priority>3</priority>
       <properties>
          <property name="reportLevel" value="10" />
@@ -73,7 +73,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/TooManyFields" message="Too many fields">
+   <rule ref="category/apex/design.xml/TooManyFields" message="Too many fields">
       <priority>3</priority>
       <properties>
          <property name="maxfields" value="20" />
@@ -83,7 +83,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/complexity.xml/AvoidDeeplyNestedIfStmts" message="Deeply nested if..else statements are hard to read">
+   <rule ref="category/apex/design.xml/AvoidDeeplyNestedIfStmts" message="Deeply nested if..else statements are hard to read">
       <priority>3</priority>
       <properties>
          <property name="problemDepth" value="4" />
@@ -93,9 +93,18 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   
+   <rule ref="category/apex/design.xml/CyclomaticComplexity">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Complexity" />
+         <property name="cc_remediation_points_multiplier" value="200" />
+         <property name="cc_block_highlighting" value="false" />
+      </properties>
+   </rule>
+
    <!-- PERFORMANCE -->
-   <rule ref="rulesets/apex/performance.xml/AvoidSoqlInLoops" message="Avoid Soql queries inside loops">
+   <rule ref="category/apex/performance.xml/AvoidSoqlInLoops" message="Avoid Soql queries inside loops">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -104,7 +113,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/performance.xml/AvoidSoslInLoops" message="Avoid Sosl queries inside loops">
+   <rule ref="category/apex/performance.xml/AvoidSoslInLoops" message="Avoid Sosl queries inside loops">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -113,7 +122,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/performance.xml/AvoidDmlStatementsInLoops" message="Avoid DML Statements inside loops">
+   <rule ref="category/apex/performance.xml/AvoidDmlStatementsInLoops" message="Avoid DML Statements inside loops">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -122,7 +131,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/style.xml/AvoidDirectAccessTriggerMap" message="Avoid directly accessing Trigger.old and Trigger.new">
+   <rule ref="category/apex/errorprone.xml/AvoidDirectAccessTriggerMap" message="Avoid directly accessing Trigger.old and Trigger.new">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -131,7 +140,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/style.xml/AvoidLogicInTrigger" message="Avoid logic in triggers">
+   <rule ref="category/apex/bestpractices.xml/AvoidLogicInTrigger" message="Avoid logic in triggers">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -140,7 +149,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/style.xml/AvoidGlobalModifier" message="Avoid using global modifier">
+   <rule ref="category/apex/bestpractices.xml/AvoidGlobalModifier" message="Avoid using global modifier">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -149,7 +158,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/style.xml/AvoidHardcodingId" message="Avoid hardcoding ID's">
+   <rule ref="category/apex/bestpractices.xml/AvoidHardcodingId" message="Avoid hardcoding ID's">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -158,8 +167,9 @@
          <property name="cc_block_highlighting" value="false"/>
       </properties>
    </rule>
+
    <!-- NAMING -->
-   <rule ref="rulesets/apex/style.xml/ClassNamingConventions" message="Class names should begin with an uppercase character">
+   <rule ref="category/apex/codestyle.xml/ClassNamingConventions" message="Class names should begin with an uppercase character">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -168,7 +178,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/style.xml/MethodNamingConventions" message="Method name does not begin with a lower case character.">
+   <rule ref="category/apex/codestyle.xml/MethodNamingConventions" message="Method name does not begin with a lower case character.">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -177,7 +187,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/style.xml/MethodWithSameNameAsEnclosingClass" message="Classes should not have non-constructor methods with the same name as the class">
+   <rule ref="category/apex/errorprone.xml/MethodWithSameNameAsEnclosingClass" message="Classes should not have non-constructor methods with the same name as the class">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -186,7 +196,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/style.xml/VariableNamingConventions" message="{0} variable {1} should begin with {2}">
+   <rule ref="category/apex/codestyle.xml/VariableNamingConventions" message="{0} variable {1} should begin with {2}">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -195,8 +205,9 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
+
    <!-- TESTS -->
-   <rule ref="rulesets/apex/apexunit.xml/ApexUnitTestClassShouldHaveAsserts" message="Apex unit test classes should have at least one System.assert() or assertEquals() or AssertNotEquals() call">
+   <rule ref="category/apex/bestpractices.xml/ApexUnitTestClassShouldHaveAsserts" message="Apex unit test classes should have at least one System.assert() or assertEquals() or AssertNotEquals() call">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -205,7 +216,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/apexunit.xml/ApexUnitTestShouldNotUseSeeAllDataTrue" message="@isTest(seeAllData=true) should not be used in Apex unit tests because it opens up the existing database data for unexpected modification by tests">
+   <rule ref="category/apex/bestpractices.xml/ApexUnitTestShouldNotUseSeeAllDataTrue" message="@isTest(seeAllData=true) should not be used in Apex unit tests because it opens up the existing database data for unexpected modification by tests">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -214,8 +225,9 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
+
    <!-- SECURITY -->
-   <rule ref="rulesets/apex/security.xml/ApexSharingViolations" message="Apex classes should declare a sharing model if DML or SOQL is used">
+   <rule ref="category/apex/security.xml/ApexSharingViolations" message="Apex classes should declare a sharing model if DML or SOQL is used">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -224,7 +236,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexInsecureEndpoint" message="Apex callouts should use encrypted communication channels">
+   <rule ref="category/apex/security.xml/ApexInsecureEndpoint" message="Apex callouts should use encrypted communication channels">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -233,7 +245,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexCSRF" message="Avoid making DML operations in Apex class constructor/init method">
+   <rule ref="category/apex/security.xml/ApexCSRF" message="Avoid making DML operations in Apex class constructor/init method">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -242,7 +254,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexOpenRedirect" message="Apex classes should safely redirect to a known location">
+   <rule ref="category/apex/security.xml/ApexOpenRedirect" message="Apex classes should safely redirect to a known location">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -251,7 +263,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexSOQLInjection" message="Apex classes should escape variables merged in DML query">
+   <rule ref="category/apex/security.xml/ApexSOQLInjection" message="Apex classes should escape variables merged in DML query">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -260,7 +272,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexXSSFromURLParam" message="Apex classes should escape Strings obtained from URL parameters">
+   <rule ref="category/apex/security.xml/ApexXSSFromURLParam" message="Apex classes should escape Strings obtained from URL parameters">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -269,7 +281,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexXSSFromEscapeFalse" message="Apex classes should escape addError strings">
+   <rule ref="category/apex/security.xml/ApexXSSFromEscapeFalse" message="Apex classes should escape addError strings">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -278,7 +290,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexBadCrypto" message="Apex Crypto should use random IV/key">
+   <rule ref="category/apex/security.xml/ApexBadCrypto" message="Apex Crypto should use random IV/key">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -287,7 +299,7 @@
          <property name="cc_block_highlighting" value="false" />
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexCRUDViolation" message="Validate CRUD permission before SOQL/DML operation">
+   <rule ref="category/apex/security.xml/ApexCRUDViolation" message="Validate CRUD permission before SOQL/DML operation">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -296,7 +308,7 @@
          <property name="cc_block_highlighting" value="false"/>
       </properties>
    </rule>
-   <rule ref="rulesets/apex/security.xml/ApexDangerousMethods" message="Calling potentially dangerous method">
+   <rule ref="category/apex/security.xml/ApexDangerousMethods" message="Calling potentially dangerous method">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -304,8 +316,8 @@
          <property name="cc_remediation_points_multiplier" value="50"/>
          <property name="cc_block_highlighting" value="false"/>
       </properties>
-   </rule>		
-   <rule ref="rulesets/apex/security.xml/ApexSuggestUsingNamedCred" message="Consider using named credentials for authenticated callouts">
+   </rule>
+   <rule ref="category/apex/security.xml/ApexSuggestUsingNamedCred" message="Consider using named credentials for authenticated callouts">
       <priority>3</priority>
       <properties>
          <!-- relevant for Code Climate output only -->
@@ -314,87 +326,89 @@
          <property name="cc_block_highlighting" value="false"/>
       </properties>
    </rule>
+
    <!-- BRACES -->
-   <rule ref="rulesets/apex/braces.xml/IfStmtsMustUseBraces" message="Avoid using if statements without curly braces">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-    <rule ref="rulesets/apex/braces.xml/WhileLoopsMustUseBraces" message="Avoid using 'while' statements without curly braces">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-      <rule ref="rulesets/apex/braces.xml/IfElseStmtsMustUseBraces" message="Avoid using 'if...else' statements without curly braces">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-     <rule ref="rulesets/apex/braces.xml/ForLoopsMustUseBraces" message="Avoid using 'for' statements without curly braces">
-    	<priority>3</priority>
-	  	<properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-    <!-- EMPTY -->
-     <rule ref="rulesets/apex/empty.xml/EmptyCatchBlock" message="Avoid empty catch blocks">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-     <rule ref="rulesets/apex/empty.xml/EmptyIfStmt" message="Avoid empty 'if' statements">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-     <rule ref="rulesets/apex/empty.xml/EmptyWhileStmt" message="Avoid empty 'while' statements">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-     <rule ref="rulesets/apex/empty.xml/EmptyTryOrFinallyBlock" message="Avoid empty try or finally blocks">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
-     <rule ref="rulesets/apex/empty.xml/EmptyStatementBlock" message="Avoid empty block statements.">
-    	<priority>3</priority>
-		  <properties>
-		   <!-- relevant for Code Climate output only -->
-		   <property name="cc_categories" value="Style" />
-		   <property name="cc_remediation_points_multiplier" value="5" />
-		   <property name="cc_block_highlighting" value="false" />
-		  </properties>
-     </rule>
+   <rule ref="category/apex/codestyle.xml/IfStmtsMustUseBraces" message="Avoid using if statements without curly braces">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+      </properties>
+   </rule>
+   <rule ref="category/apex/codestyle.xml/WhileLoopsMustUseBraces" message="Avoid using 'while' statements without curly braces">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+      </properties>
+   </rule>
+   <rule ref="category/apex/codestyle.xml/IfElseStmtsMustUseBraces" message="Avoid using 'if...else' statements without curly braces">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+         </properties>
+   </rule>
+   <rule ref="category/apex/codestyle.xml/ForLoopsMustUseBraces" message="Avoid using 'for' statements without curly braces">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+      </properties>
+   </rule>
+
+   <!-- EMPTY -->
+   <rule ref="category/apex/errorprone.xml/EmptyCatchBlock" message="Avoid empty catch blocks">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+         </properties>
+   </rule>
+   <rule ref="category/apex/errorprone.xml/EmptyIfStmt" message="Avoid empty 'if' statements">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+         </properties>
+   </rule>
+   <rule ref="category/apex/errorprone.xml/EmptyWhileStmt" message="Avoid empty 'while' statements">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+      </properties>
+   </rule>
+   <rule ref="category/apex/errorprone.xml/EmptyTryOrFinallyBlock" message="Avoid empty try or finally blocks">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+      </properties>
+   </rule>
+   <rule ref="category/apex/errorprone.xml/EmptyStatementBlock" message="Avoid empty block statements.">
+      <priority>3</priority>
+      <properties>
+         <!-- relevant for Code Climate output only -->
+         <property name="cc_categories" value="Style" />
+         <property name="cc_remediation_points_multiplier" value="5" />
+         <property name="cc_block_highlighting" value="false" />
+      </properties>
+   </rule>
 </ruleset>