removing some unnecessary classes

Doing a bit of clean up and removing/combining some classes used for json
responses. There is more, similar clean up that can be done. I will tackle it
in a subsequent commit. More test coverage is needed first though.