Better json file structure.