refactored json file structure