correct the folder structure