simple moves and renames