Getting the structure of the objects to be more in line with the JSON spec that we're following.