Split build
More cleanup
More makefile cleanup
Consildating
More consolidation
Add clean all