Refactoring handling JDP Packet data - phase 2.