Modularized.
Merge pull request #75 from darkowlzz/breaking

Modularized.