Add move() and moveTo(), and deprecated swap().