more pktgen refactor