--- a/doc/modules	Tue May 10 14:42:20 2011 +0100
+++ b/doc/modules	Tue May 10 11:09:17 2011 -0700
@@ -1,15 +1,12 @@
 /**
  * @anchor modules_anchor
  *
- * @defgroup simulator Simulator
- * The "simulator" module contains: 
+ * @defgroup core Core
+ * \brief The "core" module contains:
  *    - a time management class to hold a time and convert between various time units: ns3::Time 
  *    - a scheduler base class used to implement new simulation event schedulers:       
  *      ns3::Scheduler and ns3::SchedulerFactory 
  *    - a simulator class used to create, schedule and cancel events: ns3::Simulator
- *
- * @defgroup core Core
- * \brief The "core" module contains:
  *    - a Functor class: ns3::Callback  
  *    - an os-independent interface to get access to the elapsed wall clock time: ns3::SystemWallClockMs 
  *    - a class to register regression tests with the test manager: ns3::Test and ns3::TestManager
@@ -23,15 +20,12 @@
  *    - a configuration class used to set and control all attributes and trace sources
  *      in a simulation: ns3::Config.
  *
- * @defgroup common Common
- * The "common" module contains: 
+ * @defgroup network Network
+ * The "network" module contains: 
  *    - a packet class to create and manipulate simulation packets: 
  *      ns3::Packet, ns3::Header,  and ns3::Trailer. This packet class 
  *      also supports per-packet ns3::Tag which are  globs of data 
  *      which can be attached to any packet.
- *
- * @defgroup node Node
- * The "node" module contains:
  *    - a ns3::Node base class which should be subclassed by any new type of
  *      network Node.
  *    - models which abstract the MAC-layer from the IP layer protocols:
@@ -39,12 +33,9 @@
  *    - models which abstract the application-layer API: ns3::Application,
  *      ns3::Socket, ns3::SocketFactory, and, ns3::Udp
  * 
- *
- * @defgroup devices Devices
- *
- * @defgroup internetStack InternetStack
+ * @defgroup internet Internet
  * 
- * The "internet-stack" module contains:
+ * The "internet" module contains:
  *    - an Ipv4 stack
  *    - an Ipv6 stack
  *    - an ARP module
@@ -52,8 +43,6 @@
  *    
  * @defgroup routing Routing
  *
- * @defgroup helper Helpers
- * 
  * @defgroup applications Applications
  *
  * @defgroup mobility Mobility
@@ -64,6 +53,4 @@
  * @defgroup utils Utils
  * @brief The utils directory is for various programs and scripts related 
  * to code coverage, test suites, style checking, and benchmarking.
- * 
- * @defgroup contrib Contrib
  */