More reorganizing, need to figure out how to go build out of multiple dirs