Move methods into individual files for modular require
resolve merge conflicts
Merge pull request #58 from nickb1080/modularize

Modularize