Keep the current mod setup. It finnaly is making sense to me after two years, and after thinking about it this is a smart set up. Who cares how many groups there are? As long as a job is done efficiently (which it has been) why try to change it?