Move things around for main/test organization