Modularizing.
Merge pull request #2 from Virako/master

Modularizing.