Rename folder
Remove old folders