Refactored directory structure; Mocha compatible