Dgoodwin/rules class cleanup

Rules class cleanup, no real code changes. Commits are a pretty good summary of what was changed and why.

Did not yet address the confusion between Enforcer, EnforcerDispatcher, EntitlementRules, AbstractEntitlementRules, etc, but they are all now moved to the same java package at least.