Class name <-> File Name Agreement

Re-submitting on the dev branch.
Merge pull request #427 from jhampton/dev

Class name <-> File Name Agreement