Renamed a few files to make more sense.  Did some simple refactoring, and updated documentation