redesigned folder structure