Move things around in prep for 500 lines slimdown