Added MoveStep and Move classes