Revert "Refactor packet"

This reverts commit 8eeec38fdc33099045925ff33a5872280d701431.