improve namespacing
mocha task
refactor