Grunt: moved Mocha test spec file into standalone .js
Grunt: updated test directory structure to match src