Refactor packets
Refactor package