Modularize more functionality
Merge pull request #14 from jaccarmac/modularize

Modularize more functionality