add and rename
delete old