Update classes to match new github layout
Merge conflict
Merge pull request #14 from conroyp/updated-github-layout

Update classes to match new github layout