Started refactoring MoveBuilder.