Reverting changes to directory structure until issues with mongoose-q and grunt-mocha-test are resolved.