Folder layout cleaning