Move group variables to their respective roles