Rework BasePacket

MISTAKE :(