Changed structure of json output to be more nested