Reorganized MoveStyle and MoveType