Order of blocks in the discrete protocol.

Also fixed what appeared to be errors in the association of movement
direction and target filename.