--- a/src/mesh/model/dot11s/airtime-metric.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/airtime-metric.cc	Tue May 05 19:07:17 2015 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::AirtimeLinkMetricCalculator")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<AirtimeLinkMetricCalculator> ()
     .AddAttribute ( "TestLength",
                     "Rate should be estimated using test length.",

--- a/src/mesh/model/dot11s/dot11s-mac-header.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/dot11s-mac-header.cc	Tue May 05 19:07:17 2015 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::Dot11sMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<MeshHeader> ();
   return tid;
 }

--- a/src/mesh/model/dot11s/hwmp-protocol.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc	Tue May 05 19:07:17 2015 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::HwmpProtocol")
     .SetParent<MeshL2RoutingProtocol> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<HwmpProtocol> ()
     .AddAttribute ( "RandomStart",
                     "Random delay at first proactive PREQ",

--- a/src/mesh/model/dot11s/hwmp-rtable.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/hwmp-rtable.cc	Tue May 05 19:07:17 2015 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::HwmpRtable")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<HwmpRtable> ();
   return tid;
 }

--- a/src/mesh/model/dot11s/hwmp-tag.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/hwmp-tag.cc	Tue May 05 19:07:17 2015 -0700
@@ -86,7 +86,7 @@
 TypeId
 HwmpTag::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::dot11s::HwmpTag").SetParent<Tag> ().AddConstructor<HwmpTag> ();
+  static TypeId tid = TypeId ("ns3::dot11s::HwmpTag").SetParent<Tag> ().AddConstructor<HwmpTag> ().SetGroupName ("Mesh");
   return tid;
 }
 

--- a/src/mesh/model/dot11s/peer-link-frame.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/peer-link-frame.cc	Tue May 05 19:07:17 2015 -0700
@@ -85,8 +85,11 @@
 TypeId
 PeerLinkFrameStart::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::dot11s::PeerLinkFrameStart").SetParent<Header> ().AddConstructor<
-      PeerLinkFrameStart> ();
+  static TypeId tid = TypeId ("ns3::dot11s::PeerLinkFrameStart")
+    .SetParent<Header> ()
+    .SetGroupName ("Mesh")
+    .AddConstructor<PeerLinkFrameStart> ()
+  ;
   return tid;
 }
 TypeId

--- a/src/mesh/model/dot11s/peer-link.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/peer-link.cc	Tue May 05 19:07:17 2015 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::PeerLink")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<PeerLink> ()
     .AddAttribute ( "RetryTimeout",
                     "Retry timeout",

--- a/src/mesh/model/dot11s/peer-management-protocol.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/dot11s/peer-management-protocol.cc	Tue May 05 19:07:17 2015 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::PeerManagementProtocol")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<PeerManagementProtocol> ()
     // maximum number of peer links. Now we calculate the total
     // number of peer links on all interfaces

--- a/src/mesh/model/flame/flame-header.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/flame/flame-header.cc	Tue May 05 19:07:17 2015 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::flame::FlameHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<FlameHeader> ();
   return tid;
 }

--- a/src/mesh/model/flame/flame-protocol.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/flame/flame-protocol.cc	Tue May 05 19:07:17 2015 -0700
@@ -46,7 +46,7 @@
 TypeId
 FlameTag::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::flame::FlameTag").SetParent<Tag> ().AddConstructor<FlameTag> ();
+  static TypeId tid = TypeId ("ns3::flame::FlameTag").SetParent<Tag> ().AddConstructor<FlameTag> ().SetGroupName ("Mesh");
   return tid;
 }
 
@@ -110,6 +110,7 @@
 {
   static TypeId tid = TypeId ("ns3::flame::FlameProtocol")
     .SetParent<MeshL2RoutingProtocol> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<FlameProtocol> ()
     .AddAttribute ( "BroadcastInterval",
                     "How often we must send broadcast packets",

--- a/src/mesh/model/flame/flame-rtable.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/flame/flame-rtable.cc	Tue May 05 19:07:17 2015 -0700
@@ -38,6 +38,7 @@
   static TypeId tid =
     TypeId ("ns3::flame::FlameRtable")
     .SetParent<Object> ().AddConstructor<FlameRtable> ()
+    .SetGroupName ("Mesh")
     .AddAttribute ( "Lifetime",
                     "The lifetime of the routing enrty",
                     TimeValue (Seconds (120)), MakeTimeAccessor (

--- a/src/mesh/model/mesh-l2-routing-protocol.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/mesh-l2-routing-protocol.cc	Tue May 05 19:07:17 2015 -0700
@@ -33,7 +33,9 @@
 MeshL2RoutingProtocol::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::MeshL2RoutingProtocol")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Mesh")
+  ;
   return tid;
 }
 

--- a/src/mesh/model/mesh-point-device.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/mesh-point-device.cc	Tue May 05 19:07:17 2015 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::MeshPointDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<MeshPointDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (0xffff),

--- a/src/mesh/model/mesh-wifi-interface-mac.cc	Tue May 05 18:42:46 2015 -0700
+++ b/src/mesh/model/mesh-wifi-interface-mac.cc	Tue May 05 19:07:17 2015 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::MeshWifiInterfaceMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<MeshWifiInterfaceMac> ()
     .AddAttribute ( "BeaconInterval",
                     "Beacon Interval",