Correcting the folder structure