Fix the folder structure