Reorganize roles.