cleanup and introduction of data folder