Modularize everything
Merge pull request #6 from adinapoli/modularize

Modularize everything