diff --git a/apps/ccnx-app.cc b/apps/ccnx-app.cc
index ef81197..ba7670d 100644
--- a/apps/ccnx-app.cc
+++ b/apps/ccnx-app.cc
@@ -40,6 +40,7 @@
 CcnxApp::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::CcnxApp")
+    .SetGroupName ("Ccnx")
     .SetParent<Application> ()
     .AddConstructor<CcnxApp> ()
 
diff --git a/apps/ccnx-consumer-batches.cc b/apps/ccnx-consumer-batches.cc
index 2a86817..30bdb15 100644
--- a/apps/ccnx-consumer-batches.cc
+++ b/apps/ccnx-consumer-batches.cc
@@ -40,6 +40,7 @@
 CcnxConsumerBatches::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::CcnxConsumerBatches")
+    .SetGroupName ("Ccnx")
     .SetParent<CcnxConsumer> ()
     .AddConstructor<CcnxConsumerBatches> ()
 
diff --git a/apps/ccnx-consumer-cbr.cc b/apps/ccnx-consumer-cbr.cc
index abf4bc2..796cdad 100644
--- a/apps/ccnx-consumer-cbr.cc
+++ b/apps/ccnx-consumer-cbr.cc
@@ -45,6 +45,7 @@
 CcnxConsumerCbr::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::CcnxConsumerCbr")
+    .SetGroupName ("Ccnx")
     .SetParent<CcnxConsumer> ()
     .AddConstructor<CcnxConsumerCbr> ()
 
diff --git a/apps/ccnx-consumer-window.cc b/apps/ccnx-consumer-window.cc
index 3d6f515..8b3890d 100644
--- a/apps/ccnx-consumer-window.cc
+++ b/apps/ccnx-consumer-window.cc
@@ -39,6 +39,7 @@
 CcnxConsumerWindow::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::CcnxConsumerWindow")
+    .SetGroupName ("Ccnx")
     .SetParent<CcnxConsumer> ()
     .AddConstructor<CcnxConsumerWindow> ()
 
diff --git a/apps/ccnx-consumer.cc b/apps/ccnx-consumer.cc
index 1ddc0b1..429939e 100644
--- a/apps/ccnx-consumer.cc
+++ b/apps/ccnx-consumer.cc
@@ -55,6 +55,7 @@
 CcnxConsumer::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::CcnxConsumer")
+    .SetGroupName ("Ccnx")
     .SetParent<CcnxApp> ()
     .AddAttribute ("StartSeq", "Initial sequence number",
                    IntegerValue (0),
diff --git a/apps/ccnx-consumer.h b/apps/ccnx-consumer.h
index 58ed12d..3477a66 100644
--- a/apps/ccnx-consumer.h
+++ b/apps/ccnx-consumer.h
@@ -127,6 +127,7 @@
   bool               m_childSelector;       ///< \brief ChildSelector. See CcnxInterestHeader for more information
   CcnxNameComponents m_exclude;             ///< \brief Exclude. See CcnxInterestHeader for more information
 
+/// @cond include_hidden  
   /**
    * \struct This struct contains sequence numbers of packets to be retransmitted
    */
@@ -145,10 +146,14 @@
     uint32_t seq;
     Time time;
   };
-
+/// @endcond
+  
+/// @cond include_hidden
   class i_seq { };
   class i_timestamp { }; 
+/// @endcond
   
+/// @cond include_hidden
   /**
    * \struct This struct contains a multi-index for the set of SeqTimeout structs
    */
@@ -166,6 +171,7 @@
         >
       >
     > { } ;
+/// @endcond
 
   SeqTimeoutsContainer m_seqTimeouts;       ///< \brief multi-index for the set of SeqTimeout structs
   SeqTimeoutsContainer m_seqLifetimes;
diff --git a/apps/ccnx-producer.cc b/apps/ccnx-producer.cc
index 0a101fd..6e413a0 100644
--- a/apps/ccnx-producer.cc
+++ b/apps/ccnx-producer.cc
@@ -46,6 +46,7 @@
 CcnxProducer::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::CcnxProducer")
+    .SetGroupName ("Ccnx")
     .SetParent<CcnxApp> ()
     .AddConstructor<CcnxProducer> ()
     .AddAttribute ("Prefix","Prefix, for which producer has the data",