Better structure
Merge branch 'master' of https://github.com/rinse0ut/nodejs