Move enhanced classpath rules into separate ruleset