Redesigned folder structure