Quick Cleanup
Updated for node module structure
Updated to use mocha for tests