Added build system
Cleanup