Move things into roles