Rename RoleQuery to RoleScope

Extract Query object from RoleModel into RoleQuery