Unmarshal B2CCallback
and refactor structs
#18
Merged
B2CCallback
and refactor structs
#18