working with the new structure
Merge branch 'master' of https://github.com/fa137/buildit