Refactor mv.