internalise the collections
Merge branch 'master' of https://github.com/safwankamarrudin/SmartBuild