Added the extra data back to Move

Although I tried to trim down Move to save on memory this has the effect
of making certain code more complex. In particular, the core part of make-move
has to needlessly calculate what the type of move is.