hpacker: Move CItdPacker into separate object