Revert "Merge pull request #12 from Lastique/modularization_fix"

This reverts commit c2966979819ef0a5dc930a3719849a52d82c86fc, reversing
changes made to a9a1eddba837c1cf450e0a04cb70af8ebfe70fec.
Revert "Merge pull request #11 from Lastique/modularization"

This reverts commit a9a1eddba837c1cf450e0a04cb70af8ebfe70fec, reversing
changes made to d6bc9845ba48bdf3d8e164d6af2bd5c4530730a1.