Reduce move generator complexity
Merge pull request #34 from fluxroot/PULSE-17-reduce-move-generator-complexity

Reduce move generator complexity

PULSE-17 #wait