Index: trunk/psLib/src/sysUtils/psAbort.h
===================================================================
--- trunk/psLib/src/sysUtils/psAbort.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psAbort.h	(revision 974)
@@ -1,5 +1,3 @@
 /** @file  psAbort.h
- *
- *  @ingroup SystemGroup System Utilities
  *
  *  @brief Contains the declarations for the abort function
@@ -9,8 +7,10 @@
  *  needing to abort from program execution.
  *
+ *  @ingroup ErrorHandling
+ *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-27 19:24:32 $
+ *
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,22 +20,7 @@
 #define PS_ABORT_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
 
 // Doxygen grouping tags
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup ErrorHandling
  *  @{
  */
Index: trunk/psLib/src/sysUtils/psError.h
===================================================================
--- trunk/psLib/src/sysUtils/psError.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psError.h	(revision 974)
@@ -2,6 +2,4 @@
  *
  *  @brief Contains the declarations for the error reporting functions
- *
- *  @ingroup SystemGroup
  *
  *  Error reporting functions shall be used to create log entries in the
@@ -10,8 +8,10 @@
  *  of error detected.
  *
+ *  @ingroup ErrorHandling
+ *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-27 19:24:32 $
+ *
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,21 +21,5 @@
 #define PS_ERROR_H
 
-/******************************************************************************/
-/*  DEFINE STATEMENTS                                                         */
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-/*  TYPE DEFINITIONS                                                          */
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-/* FUNCTION PROTOTYPES                                                       */
-/*****************************************************************************/
-
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup ErrorHandling
  *  @{
  */
@@ -56,5 +40,5 @@
 );
 
-/* @} */  // End of SystemGroup Functions
+/* @} */  // End of SysUtils Functions
 
 #endif
Index: trunk/psLib/src/sysUtils/psHash.h
===================================================================
--- trunk/psLib/src/sysUtils/psHash.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psHash.h	(revision 974)
@@ -12,6 +12,6 @@
  *  @author George Gusciora, MHPCC
  *   
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-10 01:31:05 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,5 +21,5 @@
 #define PS_HASH_H
 
-/** \addtogroup HashTable Hash Table
+/** \addtogroup HashTable
  *  \{
  */
Index: trunk/psLib/src/sysUtils/psLogMsg.h
===================================================================
--- trunk/psLib/src/sysUtils/psLogMsg.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psLogMsg.h	(revision 974)
@@ -1,16 +1,14 @@
 #if !defined(PS_LOG_MSG_H)
 #define PS_LOG_MSG_H
-#endif
 
 /** \file psLogMsg.h
  *  \brief log messaging facilities
- *  \ingroup SystemGroup
+ *  \ingroup LogTrace
  */
 
 #include <stdarg.h>
 
-/** Functions **************************************************************/
-/** \addtogroup SystemGroup System Utilities
- *  \{
+/** @addtogroup LogTrace
+ *  @{
  */
 
@@ -56,5 +54,4 @@
 ;
 
-/* \} */ // End of SystemGroup Functions
 
 ///< Status codes for log messages
@@ -71,2 +68,5 @@
     PS_LOG_TO_STDOUT };
 
+/// @}
+
+#endif
Index: trunk/psLib/src/sysUtils/psMemory.h
===================================================================
--- trunk/psLib/src/sysUtils/psMemory.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psMemory.h	(revision 974)
@@ -12,8 +12,8 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-04 23:46:48 $
- *
- *  @ingroup SystemGroup System Utilities
+ *  @ingroup MemoryManagement
+ *
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,12 +21,7 @@
 
 #include <stdio.h>                      // needed for FILE
-#include <pthread.h>                   // we need a mutex to make this stuff thread safe.
-
-/** @addtogroup MemoryManagement Memory Management Utilities
- *  @ingroup SystemGroup
- *
- *  This is the generic memory management system put inbetween the user's high level code and the OS-level
- *  memory allocation routines.  This system adds such features as callback routines for memory error events,
- *  tracing capabilities, and reference counting.
+#include <pthread.h>                    // we need a mutex to make this stuff thread safe.
+
+/** @addtogroup MemoryManagement
  *  @{
  */
Index: trunk/psLib/src/sysUtils/psString.h
===================================================================
--- trunk/psLib/src/sysUtils/psString.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psString.h	(revision 974)
@@ -3,5 +3,5 @@
  *  @brief Contains the declarations of string utility functions
  *
- *  @ingroup SystemGroup
+ *  @ingroup SysUtils
  *
  *  String utility functions defined shall provide basic string copying
@@ -9,7 +9,7 @@
  *
  *  @author Eric Van Alst, MHPCC
- *   
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-28 22:19:20 $
+ *
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37,5 +37,5 @@
 
 // Doxygen group tags
-/** @addtogroup SystemGroup System Utilities
+/** @addtogroup SysUtils
  *  @{
  */
Index: trunk/psLib/src/sysUtils/psTrace.h
===================================================================
--- trunk/psLib/src/sysUtils/psTrace.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psTrace.h	(revision 974)
@@ -6,5 +6,5 @@
 /** \file psTrace.h
  *  \brief basic run-time trace facilities
- *  \ingroup SystemGroup
+ *  \ingroup LogTrace
  */
 
@@ -23,8 +23,10 @@
 Component;
 
-/** Functions **************************************************************/
-/** \addtogroup SystemGroup System Utilities
+/** \addtogroup LogTrace
  *  \{
  */
+
+
+/** Functions **************************************************************/
 
 /// Send a trace message
Index: trunk/psLib/src/sysUtils/psType.h
===================================================================
--- trunk/psLib/src/sysUtils/psType.h	(revision 969)
+++ trunk/psLib/src/sysUtils/psType.h	(revision 974)
@@ -5,9 +5,11 @@
  *  This file defines common datatypes used throughout psLib.
  *
+ *  @ingroup DataContainer
+ *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-02 23:29:14 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-10 01:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,4 +21,7 @@
 #include <complex.h>
 #include <stdint.h>
+
+/// @addtogroup DataContainer
+/// @{
 
 /******************************************************************************/
@@ -114,3 +119,5 @@
 psType;
 
+/// @}
+
 #endif
