More moving around and reduction of complexity in Model class. Fixed a bug in the system.roles controller