Changed structure to single json file