Better organization of classes to allow for easier extensibility
Merge pull request #1 from cycorp/BetterOrganizedClasses

Better organization of classes to allow for easier extensibility