build reorganizing, prep for 0.6