Breaking out code into separate modules
Merge pull request #24 from wpreul/master

Breaking out code into separate modules