Get all the module names right to compile under GHC 7.4.2
Undid some unnecessary changes to get things to compile
Merge pull request #1 from jupdike/master

Simple change: got all the module names right to compile under GHC 7.4.2 (and probably newer)