rename folders, remove old folders