Rename folder for new folder structure