Cleanup and Rules organisation

This should make the Rules a lot easier to manage.

Next job is to look at the Specs and see if they should also be broken down....