Revert "Packet/Class Structure Changes"

This reverts commit 27ac8a74eb8d3851fe4f213c0ffbe9bb4ba8815d.