full fix of folder structure