fix the folder structure