Refactor Packet to be more usable