data folder restructure