Attempt at cleaning up the API.
Move mocha.html to test dir and clean it up a bit.
Merge branch 'bs-api-cleanup' into master