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

This reverts commit 775a8a1a83d7e7471ec6e1737d021d40051664f6.

Conflicts:
	Gruntfile.js