reviewed structure
update related to data folder