Switched to a modular structure
Merge pull request #3 from astagi/master

Switched to a modular structure