Made some sweet Json Formatting changes

Moved ViewModels into the models folder, Just easier to edit when they
are all in the same spot.