Move roles around more for organizational purposes