#2666: Added move generators for extract, merge, shift, and split moves and renamed those to EMSS moves, some code cleanup