Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 13830)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 13831)
@@ -11,7 +11,7 @@
 if WRAPPERS
 if SHAREDLIBS
-lib_LTLIBRARIES += libISSMWrappers.la
-endif
-lib_LIBRARIES += libISSMWrappers.a 
+lib_LTLIBRARIES += libISSMModules.la
+endif
+lib_LIBRARIES += libISSMModules.a 
 endif
 #}}}
@@ -215,7 +215,4 @@
 					./shared/String/sharedstring.h\
 					./shared/String/DescriptorIndex.cpp\
-					./shared/Wrapper/wrappershared.h\
-					./shared/Wrapper/ModuleBoot.cpp\
-					./shared/Wrapper/ModuleEnd.cpp\
 					./toolkits/metis/metisincludes.h\
 					./toolkits/issm/issmtoolkit.h\
@@ -755,6 +752,6 @@
 					./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp
 #}}}
-#Wrappers sources{{{
-wrapper_sources= ./shared/Threads/issm_threads.h\
+#Modules sources{{{
+modules_sources= ./shared/Threads/issm_threads.h\
 			./shared/Threads/LaunchThread.cpp\
 			./shared/Threads/PartitionRange.cpp\
@@ -927,16 +924,16 @@
 
 if WRAPPERS
-libISSMWrappers_a_SOURCES = $(wrapper_sources)
-libISSMWrappers_a_SOURCES += $(bamg_sources)
+libISSMModules_a_SOURCES = $(modules_sources)
+libISSMModules_a_SOURCES += $(bamg_sources)
 if KRIGING
-libISSMWrappers_a_SOURCES += $(kriging_sources)
+libISSMModules_a_SOURCES += $(kriging_sources)
 endif
 if KML
-libISSMWrappers_a_SOURCES += $(kml_sources)
-endif
-libISSMWrappers_a_CXXFLAGS = $(ALLCXXFLAGS)
-libISSMWrappers_a_LIBADD = ./libISSMCore.a
+libISSMModules_a_SOURCES += $(kml_sources)
+endif
+libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS)
+libISSMModules_a_LIBADD = ./libISSMCore.a
 if SHAREDLIBS
-libISSMWrappers_la_SOURCES = $(libISSMWrappers_a_SOURCES)
+libISSMModules_la_SOURCES = $(libISSMModules_a_SOURCES)
 endif
 endif
Index: /issm/trunk-jpl/src/c/shared/shared.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/shared.h	(revision 13830)
+++ /issm/trunk-jpl/src/c/shared/shared.h	(revision 13831)
@@ -19,5 +19,4 @@
 #include "./Threads/issm_threads.h"
 #include "./TriMesh/trimesh.h"
-#include "./Wrapper/wrappershared.h"
 
 #endif
Index: /issm/trunk-jpl/src/m/os/issmscpin.m
===================================================================
--- /issm/trunk-jpl/src/m/os/issmscpin.m	(revision 13830)
+++ /issm/trunk-jpl/src/m/os/issmscpin.m	(revision 13831)
@@ -61,6 +61,8 @@
 			string=[string packages{end} '\}'];
 		end
+		disp('-------------- file: issmscpin.m line: 63'); 
 
 		if port,
+			['!scp -P ' num2str(port) ' ' login '@localhost:' path '/' string ' ./']
 			eval(['!scp -P ' num2str(port) ' ' login '@localhost:' path '/' string ' ./']);
 		else
Index: /issm/trunk-jpl/src/m/os/issmscpout.m
===================================================================
--- /issm/trunk-jpl/src/m/os/issmscpout.m	(revision 13830)
+++ /issm/trunk-jpl/src/m/os/issmscpout.m	(revision 13831)
@@ -50,4 +50,5 @@
 
 		if port,
+			['!scp -P ' num2str(port) ' ' string ' ' login '@localhost:' path]
 			eval(['!scp -P ' num2str(port) ' ' string ' ' login '@localhost:' path]);
 		else
Index: /issm/trunk-jpl/src/wrappers/matlab/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 13830)
+++ /issm/trunk-jpl/src/wrappers/matlab/Makefile.am	(revision 13831)
@@ -84,7 +84,7 @@
 #Flags and libraries {{{
 #if SHAREDLIBS
-#deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
+#deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
 #else
-#deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
+#deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
 #endif
 #deps +=  $(MATHLIB) ${MEXLIB}
@@ -113,5 +113,5 @@
 deps +=
 else
-deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a  
+deps += ../../c/libISSMModules.a ../../c/libISSMCore.a  
 if ADOLC
 deps += $(ADOLCLIB)
Index: /issm/trunk-jpl/src/wrappers/python/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/wrappers/python/Makefile.am	(revision 13830)
+++ /issm/trunk-jpl/src/wrappers/python/Makefile.am	(revision 13831)
@@ -41,7 +41,7 @@
 #Flags and libraries {{{
 #if SHAREDLIBS
-#deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
+#deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
 #else
-#deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
+#deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
 #endif
 #deps +=  $(MATHLIB) ${PYTHONLIB}
@@ -73,5 +73,5 @@
 deps += 	 	 
 else 	 	 
-deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a 	 	 
+deps += ../../c/libISSMModules.a ../../c/libISSMCore.a 	 	 
 endif