Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 15047)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 15048)
@@ -59,6 +59,4 @@
 					./classes/Vertex.cpp\
 					./classes/AdolcEdf.h\
-					./classes/ToolkitOptions.h\
-					./classes/ToolkitOptions.cpp\
 					./classes/Hook.h\
 					./classes/Hook.cpp\
@@ -230,4 +228,6 @@
 					./toolkits/issm/IssmSolver.h\
 					./toolkits/issm/IssmSolver.cpp\
+					./toolkits/ToolkitOptions.h\
+					./toolkits/ToolkitOptions.cpp\
 					./toolkits/triangle/triangleincludes.h\
 					./toolkitsenums.h\
Index: sm/trunk-jpl/src/c/classes/ToolkitOptions.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 15047)
+++ 	(revision )
@@ -1,98 +1,0 @@
-/*! \file ToolkitOptions.cpp
- * \brief  file containing the methods for ToolkitOptions.h
- */
-
-#ifdef HAVE_CONFIG_H
-	#include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#include <string.h>
-#include "./ToolkitOptions.h"
-#include "../shared/Numerics/types.h"
-#include "../shared/Exceptions/exceptions.h"
-#include "../shared/MemOps/MemOps.h"
-
-void ToolkitOptions::Init(char* options){ /*{{{*/
-
-	/*First, avoid a leak: */
-	xDelete<char>(toolkitoptions);
-
-	/*copy options into toolkitoptions:*/
-	_assert_(options);
-	toolkitoptions= xNew<char>(strlen(options)+1); 
-	sprintf(toolkitoptions,   "%s",options);
-
-}/*}}}*/
-char* ToolkitOptions::GetToolkitType(){  /*{{{*/
-
-	/*Look for token: -toolkit, and return value:*/
-
-	return TokenValue(toolkitoptions,"toolkit");
-
-}/*}}}*/
-char* ToolkitOptions::GetToolkitOptionValue(const char* option){  /*{{{*/
-
-	return TokenValue(toolkitoptions,option);
-
-}/*}}}*/
-char* TokenValue(char* tokenlist,const char* target){ /*{{{*/
-
-	/*output:*/
-	char* value=NULL;
-
-	/*intermediary: */
-	char *token         = NULL;
-	char *tokenlistcopy = NULL;
-
-	/*First, because tokenizing destroys a string, copy what we have: */
-	_assert_(tokenlist);
-	tokenlistcopy= xNew<char>(strlen(tokenlist)+1); 
-	sprintf(tokenlistcopy,"%s",tokenlist);
-
-	/*Now go through list of tokens, and look for  target, return value: */
-	token=strtok(tokenlistcopy, " ");
-	while(token != NULL) {
-
-		/*Is this token starting with "-", if so, compare to our target: */
-		if (strncmp(token,"-",1)==0){
-			if (strcmp(token+1,target)==0){
-				/*Ok, we found our target. Get next token: */
-				token = strtok(NULL, " ");
-				/*This token could actually be another option start with "-", just be sure: */
-				if (strncmp(token,"-",1)==0){
-					/*ok, we hit another option, which means our target value is "":*/
-					value= xNew<char>(strlen("")+1); 
-					sprintf(value,"%s","");
-					continue;
-				}
-				else{
-					/*this token is the value we are looking for, copy: */
-					value= xNew<char>(strlen(token)+1); 
-					sprintf(value,"%s",token);
-				}
-			}
-			else{
-				/*we found the wrong target. Go to the next option: */
-				token = strtok(NULL, " ");
-				if (strncmp(token,"-",1)==0){
-					/*this is indeed an option, continue: */
-					continue;
-				}
-				else{
-					/*this is the value of the option, discard it: */
-				}
-			}
-		}
-		else _error_("token list should start with an option, not a value");
-
-		/*Get new token and continue*/
-		token = strtok(NULL, " ");
-	}
-
-	/*Clean up and return*/
-	xDelete<char>(tokenlistcopy);
-	return value;
-}
-/*}}}*/
Index: sm/trunk-jpl/src/c/classes/ToolkitOptions.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/ToolkitOptions.h	(revision 15047)
+++ 	(revision )
@@ -1,32 +1,0 @@
-/* \file ToolkitOptions.h
- * \brief  create a class with a static string of options, and static methods to access it
- * This is a way of protecting access to the toolkit options, and to make it accessible everywhere
- * in the code.
- */
-
-#ifndef _TOOLKIT_OPTIONS_H
-#define _TOOLKIT_OPTIONS_H
-
-/*{{{*/
-#ifdef HAVE_CONFIG_H
-	#include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-/*}}}*/
-
-class ToolkitOptions {
-
-	private:
-		static char* toolkitoptions;
-
-	public:
-		static void Init(char* options);
-		static char* GetToolkitType(void);
-		static char* GetToolkitOptionValue(const char* option);
-};
-
-char* TokenValue(char* tokenlist,const char* target);
-
-#endif  /* _TOOLKIT_OPTIONS_H */
Index: /issm/trunk-jpl/src/c/classes/classes.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/classes.h	(revision 15047)
+++ /issm/trunk-jpl/src/c/classes/classes.h	(revision 15048)
@@ -160,5 +160,4 @@
 #include "./GiaDeflectionCoreArgs.h"
 #include "./AdolcEdf.h"
-#include "./ToolkitOptions.h"
 #include "./RiftStruct.h"
 
Index: /issm/trunk-jpl/src/c/main/globals.h
===================================================================
--- /issm/trunk-jpl/src/c/main/globals.h	(revision 15047)
+++ /issm/trunk-jpl/src/c/main/globals.h	(revision 15048)
@@ -7,5 +7,5 @@
 
 #include "../shared/io/Comm/Comm.h"
-#include "../classes/ToolkitOptions.h"
+#include "../toolkits/ToolkitOptions.h"
 
 /*Communicators: */
Index: /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp	(revision 15048)
+++ /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.cpp	(revision 15048)
@@ -0,0 +1,98 @@
+/*! \file ToolkitOptions.cpp
+ * \brief  file containing the methods for ToolkitOptions.h
+ */
+
+#ifdef HAVE_CONFIG_H
+	#include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+#include <string.h>
+#include "./ToolkitOptions.h"
+#include "../shared/Numerics/types.h"
+#include "../shared/Exceptions/exceptions.h"
+#include "../shared/MemOps/MemOps.h"
+
+void ToolkitOptions::Init(char* options){ /*{{{*/
+
+	/*First, avoid a leak: */
+	xDelete<char>(toolkitoptions);
+
+	/*copy options into toolkitoptions:*/
+	_assert_(options);
+	toolkitoptions= xNew<char>(strlen(options)+1); 
+	sprintf(toolkitoptions,   "%s",options);
+
+}/*}}}*/
+char* ToolkitOptions::GetToolkitType(){  /*{{{*/
+
+	/*Look for token: -toolkit, and return value:*/
+
+	return TokenValue(toolkitoptions,"toolkit");
+
+}/*}}}*/
+char* ToolkitOptions::GetToolkitOptionValue(const char* option){  /*{{{*/
+
+	return TokenValue(toolkitoptions,option);
+
+}/*}}}*/
+char* TokenValue(char* tokenlist,const char* target){ /*{{{*/
+
+	/*output:*/
+	char* value=NULL;
+
+	/*intermediary: */
+	char *token         = NULL;
+	char *tokenlistcopy = NULL;
+
+	/*First, because tokenizing destroys a string, copy what we have: */
+	_assert_(tokenlist);
+	tokenlistcopy= xNew<char>(strlen(tokenlist)+1); 
+	sprintf(tokenlistcopy,"%s",tokenlist);
+
+	/*Now go through list of tokens, and look for  target, return value: */
+	token=strtok(tokenlistcopy, " ");
+	while(token != NULL) {
+
+		/*Is this token starting with "-", if so, compare to our target: */
+		if (strncmp(token,"-",1)==0){
+			if (strcmp(token+1,target)==0){
+				/*Ok, we found our target. Get next token: */
+				token = strtok(NULL, " ");
+				/*This token could actually be another option start with "-", just be sure: */
+				if (strncmp(token,"-",1)==0){
+					/*ok, we hit another option, which means our target value is "":*/
+					value= xNew<char>(strlen("")+1); 
+					sprintf(value,"%s","");
+					continue;
+				}
+				else{
+					/*this token is the value we are looking for, copy: */
+					value= xNew<char>(strlen(token)+1); 
+					sprintf(value,"%s",token);
+				}
+			}
+			else{
+				/*we found the wrong target. Go to the next option: */
+				token = strtok(NULL, " ");
+				if (strncmp(token,"-",1)==0){
+					/*this is indeed an option, continue: */
+					continue;
+				}
+				else{
+					/*this is the value of the option, discard it: */
+				}
+			}
+		}
+		else _error_("token list should start with an option, not a value");
+
+		/*Get new token and continue*/
+		token = strtok(NULL, " ");
+	}
+
+	/*Clean up and return*/
+	xDelete<char>(tokenlistcopy);
+	return value;
+}
+/*}}}*/
Index: /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.h	(revision 15048)
+++ /issm/trunk-jpl/src/c/toolkits/ToolkitOptions.h	(revision 15048)
@@ -0,0 +1,32 @@
+/* \file ToolkitOptions.h
+ * \brief  create a class with a static string of options, and static methods to access it
+ * This is a way of protecting access to the toolkit options, and to make it accessible everywhere
+ * in the code.
+ */
+
+#ifndef _TOOLKIT_OPTIONS_H
+#define _TOOLKIT_OPTIONS_H
+
+/*{{{*/
+#ifdef HAVE_CONFIG_H
+	#include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+/*}}}*/
+
+class ToolkitOptions {
+
+	private:
+		static char* toolkitoptions;
+
+	public:
+		static void Init(char* options);
+		static char* GetToolkitType(void);
+		static char* GetToolkitOptionValue(const char* option);
+};
+
+char* TokenValue(char* tokenlist,const char* target);
+
+#endif  /* _TOOLKIT_OPTIONS_H */
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 15047)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 15048)
@@ -16,7 +16,7 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../classes/ToolkitOptions.h"
 #include "../../shared/io/Comm/Comm.h"
 #include "../../shared/Enum/Enum.h"
+#include "../ToolkitOptions.h"
 #include "./IssmToolkitUtils.h"
 
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp	(revision 15047)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp	(revision 15048)
@@ -13,7 +13,7 @@
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/io/Comm/Comm.h"
-#include "../../classes/ToolkitOptions.h"
 #include "../../shared/Enum/Enum.h"
 #include "../../shared/Exceptions/exceptions.h"
+#include "../ToolkitOptions.h"
 #include "./IssmToolkitUtils.h"
 #include <string.h>
Index: /issm/trunk-jpl/src/c/toolkits/toolkits.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/toolkits.h	(revision 15047)
+++ /issm/trunk-jpl/src/c/toolkits/toolkits.h	(revision 15048)
@@ -31,4 +31,4 @@
 #include "./toolkitsenums.h"
 #include "./issm/issmtoolkit.h"
-#include "../classes/ToolkitOptions.h"
+#include "./ToolkitOptions.h"
 #endif