Move things around for the new format