better class structure
Merge pull request #9 from brad-haan/refactor

better class structure