Move packet IDs out of packet structs and modify ID logic