cancellation parsing

New class to parse cancellation messages
code reorg
more reorg