Task #549 IGMPv3 struct consolidation and refactoring