Redid folder structure