restructure the data folder