A bit of restructuring for where activities live