Reorganization of gem
Move roles utility methods to RoleModel
Remove unused methods