Cleanup
Add complete buildscript