Introduced a MoveType enum and fixed dependencies