Major refactor and addition of unit tests
Include subdirs are singular, not plural
Merge pull request #3 from bkkrw/master

Major refactor and addition of unit tests