Redid the folder structure