Refactor on Board mover code