Adding build system
Cleanup of build process