Index: /trunk/archive/pslib/include/psLib.h
===================================================================
--- /trunk/archive/pslib/include/psLib.h	(revision 397)
+++ /trunk/archive/pslib/include/psLib.h	(revision 398)
@@ -12,4 +12,10 @@
 
 /** @defgroup SystemGroup System Utilities */
+/** @defgroup DataGroup General Data Container Utilities */
+/** @defgroup MathGroup Math Utilities */
+/** @defgroup AstroGroup Astronomy-Specific Utilities */
+
+
+/** @ingroup SystemGroup */
 # include <psMemory.h>
 # include <psTrace.h>
@@ -18,5 +24,5 @@
 # include <psError.h>
 
-/** @defgroup DataGroup General Data Container Utilities */
+/** @ingroup DataGroup */
 # include <psStdArrays.h>
 # include <psHash.h>
@@ -24,12 +30,13 @@
 
 /* These are here to ensure things compile --- ordering is important.  ): */
+/* They are also listed later to keep things together */
 /** @ingroup MathGroup */
 # include <psStats.h>
 # include <psFunctions.h>
 /** @ingroup AstroGroup */
-# include <psMetaData.h>
+# include <psMetadata.h>
 # include <psImage.h>
 
-/** @defgroup MathGroup Math Utilities */
+/** @ingroup MathGroup */
 # include <psBitMask.h>
 # include <psFFT.h>
@@ -41,8 +48,8 @@
 # include <psSort.h>
 
-/** @defgroup AstroGroup Astronomy-Specific Utilities */
+/** @ingroup AstroGroup */
 # include <psPosition.h>
 # include <psDateTime.h>
-# include <psMetaData.h>
+# include <psMetadata.h>
 # include <psImage.h>
 # include <psPhotom.h>