Index: trunk/Ohana/src/mosastro/include/mosastro.h
===================================================================
--- trunk/Ohana/src/mosastro/include/mosastro.h	(revision 7401)
+++ trunk/Ohana/src/mosastro/include/mosastro.h	(revision 8499)
@@ -89,11 +89,7 @@
 double ZERO_POINT;
 
-char StoneRegions[256];
-char CDROM[256];
-char USNO_B_DIR[256];
 char REFCAT[256];
-char CATDIR[256];
-char   CATMODE[16];    /* raw, mef, split, mysql */
-char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
+char CATMODE[16];    /* raw, mef, split, mysql */
+char CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
 char ExptimeKeyword[256];
 char DateKeyword[256];
@@ -102,11 +98,16 @@
 char MJDKeyword[256];
 char JDKeyword[256];
-char TWO_MASS_DIR[256];
 int VERBOSE;
 int NO_CHIPS;
 int SAVE_RESID;
 
+char CATDIR[256];
 char GSCFILE[256];
-char GSC_DIR[256];
+char GSCDIR[256];
+char USNO_A_DIR[256];
+char USNO_B_DIR[256];
+char TWO_MASS_DIR[256];
+char ASTROM_CATDIR[256];
+char StoneRegions[256];
 
 char *FIELD;