Refactor Move code part 1.