Renamed some classes so that they make more since.  Got the JSON responses all working for the existing methods.