Rename some more of the classes from the QueryResult->Record change. Reorganize
the package layout too to give some better organization. #6