removing json files and using objects instead