massive restructure
Merge branch 'develop' of https://github.com/nkigen/ubuild into develop