Tags is now directly under Packet as a map. Also some clean up.