Update to the api and tools namespaces
Merge branch 'master' of github.com:TKerstiens/tkerstiens