Massage json structure

So for that the app does not explore into itty bitty peices