Fixing messed up folder structure