Move things around in prep to get more organized