changed some names and added extra field as appropriate. 
> Cherry, changed the params of classPacket