Refactoring with a modular approach.
Merge branch 'master' of https://github.com/hrkhal/nedry