Fixing the build

Fixing some post-merge issues with the build. Basically just changing
Packet back to LGPacketType everywhere and then I moved some files
around for organizational purposes.