folder structure and data JSONs added