Cleaned up duplicate classes
Merge pull request #72 from mdanter/master

Cleaned up duplicate classes