Rearrange roles and role scopes to make configuration easier