more build cleanup and restructuring