diff --git a/mrw/deque.hpp b/mrw/deque.hpp
index 45f9b60..0f71c7c 100644
--- a/mrw/deque.hpp
+++ b/mrw/deque.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.3  2005/04/07 20:48:20  marc
+    docu: new doxygen, new grouping
+
     Revision 1.2  2004/12/20 07:40:35  marc
     documentation improved, new grouping
 
@@ -24,9 +27,6 @@
 #include <mrw/exception.hpp>
 #include <mrw/string.hpp>
 
-/** @addtogroup StdExt
- */
-//@{
 /** @addtogroup StdExtSTL
  */
 //@{
@@ -81,7 +81,6 @@ std::deque<T, A>& operator>>(std::deque<T, A>& l, T& o) throw(std::exception) {
   return l;
 }
 
-//@}
 //@}
 //@}
 
diff --git a/mrw/functiontrace.hpp b/mrw/functiontrace.hpp
index f782635..a145bda 100644
--- a/mrw/functiontrace.hpp
+++ b/mrw/functiontrace.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.2  2005/04/07 20:50:13  marc
+    docu: new doxygen, new grouping
+
     Revision 1.1  2005/03/11 21:07:54  marc
     initial version
 
@@ -27,6 +30,9 @@
 
 namespace mrw {
 
+  /** @addtogroup debug */
+  //@{
+  
   /** @defgroup FunctionTrace Function Tracing (using log4cxx)
       @pre #include <mrw/functiontrace.hpp>
       
@@ -270,5 +276,6 @@ namespace mrw {
       static unsigned int _level;
   };
   //@}
+  //@}
 }
 #endif
diff --git a/mrw/list.hpp b/mrw/list.hpp
index 5349722..c4ed330 100644
--- a/mrw/list.hpp
+++ b/mrw/list.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.3  2005/04/07 20:48:20  marc
+    docu: new doxygen, new grouping
+
     Revision 1.2  2004/12/20 07:40:35  marc
     documentation improved, new grouping
 
@@ -40,7 +43,12 @@
     }
     @endcode
 */
+//@}
+
+/** @addtogroup StdExtSTL
+    */
 //@{
+
 /** @defgroup StdExtliststl list
  */
 //@{
diff --git a/mrw/map.hpp b/mrw/map.hpp
index c740748..c023937 100644
--- a/mrw/map.hpp
+++ b/mrw/map.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.3  2005/04/07 20:48:20  marc
+    docu: new doxygen, new grouping
+
     Revision 1.2  2004/12/20 07:40:35  marc
     documentation improved, new grouping
 
@@ -24,9 +27,6 @@
 #include <mrw/exception.hpp>
 #include <mrw/string.hpp>
 
-/** @addtogroup StdExt
- */
-//@{
 /** @addtogroup StdExtSTL
  */
 //@{
@@ -90,7 +90,6 @@ std::map<K, T, C, A>& operator>>(std::map<K, T, C, A>& l, std::pair<K, T>& o)
   return l;
 }
 
-//@}
 //@}
 //@}
 
diff --git a/mrw/multimap.hpp b/mrw/multimap.hpp
index 8017876..6f0114c 100644
--- a/mrw/multimap.hpp
+++ b/mrw/multimap.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.3  2005/04/07 20:48:20  marc
+    docu: new doxygen, new grouping
+
     Revision 1.2  2004/12/20 07:40:36  marc
     documentation improved, new grouping
 
@@ -24,13 +27,10 @@
 #include <mrw/exception.hpp>
 #include <mrw/string.hpp>
 
-/** @addtogroup StdExt
- */
-//@{
 /** @addtogroup StdExtSTL
  */
 //@{
-/** @addtogroup StdExtmultimap multimap
+/** @defgroup StdExtmultimap multimap
  */
 //@{
 
@@ -86,7 +86,6 @@ std::multimap<K, T, C, A>& operator>>(std::multimap<K, T, C, A>& l, std::pair<K,
   return l;
 }
 
-//@}
 //@}
 //@}
 
diff --git a/mrw/multiset.hpp b/mrw/multiset.hpp
index 6b8bf9a..c6177ee 100644
--- a/mrw/multiset.hpp
+++ b/mrw/multiset.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.3  2005/04/07 20:48:20  marc
+    docu: new doxygen, new grouping
+
     Revision 1.2  2004/12/20 07:40:36  marc
     documentation improved, new grouping
 
@@ -24,9 +27,6 @@
 #include <mrw/exception.hpp>
 #include <mrw/string.hpp>
 
-/** @addtogroup StdExt
- */
-//@{
 /** @addtogroup StdExtSTL
  */
 //@{
@@ -81,7 +81,6 @@ std::multiset<T, C, A>& operator>>(std::multiset<T, C, A>& l, T& o) throw(std::e
   return l;
 }
 
-//@}
 //@}
 //@}
 
diff --git a/mrw/set.hpp b/mrw/set.hpp
index 2991180..8b254f5 100644
--- a/mrw/set.hpp
+++ b/mrw/set.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.3  2005/04/07 20:48:20  marc
+    docu: new doxygen, new grouping
+
     Revision 1.2  2004/12/20 07:40:36  marc
     documentation improved, new grouping
 
@@ -24,9 +27,6 @@
 #include <mrw/exception.hpp>
 #include <mrw/string.hpp>
 
-/** @addtogroup StdExt
- */
-//@{
 /** @addtogroup StdExtSTL
  */
 //@{
@@ -88,7 +88,6 @@ std::set<T, C, A>& operator>>(std::set<T, C, A>& l, T& o)
   return l;
 }
 
-//@}
 //@}
 //@}
 
diff --git a/mrw/stacktrace.hpp b/mrw/stacktrace.hpp
index 15083d7..5307b82 100644
--- a/mrw/stacktrace.hpp
+++ b/mrw/stacktrace.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.15  2005/04/07 20:51:30  marc
+    docu: new doxygen, new grouping
+
     Revision 1.14  2005/03/11 23:22:58  marc
     It's multithreaded now, thanks to a boost mutex
 
@@ -71,6 +74,9 @@
 
 namespace mrw {
 
+  /** @defgroup debug Debug Utilities */
+  //@{
+  
   /** @defgroup grpStackTrace Collect and Format a Stack Trace
 
       Somewhere in a program, there is a fatal error, e.g. an
@@ -298,6 +304,7 @@ namespace mrw {
   };
 
   //@}
+  //@}
 }
 
 /** @addtogroup grpStackTrace */
diff --git a/mrw/string.hpp b/mrw/string.hpp
index 9ecfd91..46fdabf 100644
--- a/mrw/string.hpp
+++ b/mrw/string.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.6  2005/04/07 20:48:42  marc
+    docu: new doxygen, new grouping
+
     Revision 1.5  2005/01/28 07:53:09  marc
     doc: hint regarding iomanip on string
 
@@ -165,6 +168,10 @@ namespace mrw {
             They may now throw exceptions if conversion fails!
             (since 1.4.1)
   */
+  //@}
+
+  /** @addtogroup stdextstring
+      */
   //@{
 
 
@@ -209,13 +216,9 @@ namespace mrw {
   }
 
   //@}
-  //@}
 
 }
 
-/** @addtogroup StdExt
- */
-//@{
 /** @addtogroup stdextstring
  */
 //@{
@@ -556,7 +559,6 @@ inline std::string& operator+=(std::string& s, signed long o)
   return s+=mrw::string(o);
 }
 
-//@}
 //@}
 
 #endif
diff --git a/mrw/vector.hpp b/mrw/vector.hpp
index 6a9da6d..44eec48 100644
--- a/mrw/vector.hpp
+++ b/mrw/vector.hpp
@@ -9,6 +9,9 @@
     @license LGPL, see file <a href="license.html">COPYING</a>
 
     $Log$
+    Revision 1.3  2005/04/07 20:48:20  marc
+    docu: new doxygen, new grouping
+
     Revision 1.2  2004/12/20 07:40:36  marc
     documentation improved, new grouping
 
@@ -24,9 +27,6 @@
 #include <mrw/exception.hpp>
 #include <mrw/string.hpp>
 
-/** @addtogroup StdExt
- */
-//@{
 /** @addtogroup StdExtSTL
  */
 //@{
@@ -81,7 +81,6 @@ std::vector<T, A>& operator>>(std::vector<T, A>& l, T& o) throw(std::exception)
   return l;
 }
 
-//@}
 //@}
 //@}