Move things around in preparation for variants