Refactor
Refactor exe/undo move