diff --git a/DataTree b/DataTree
index 854dfe71..30a17517 160000
--- a/DataTree
+++ b/DataTree
@@ -1 +1 @@
-Subproject commit 854dfe715d40386e41849accbc4a5125e3e87324
+Subproject commit 30a17517fd24ac2867945aae6a86732759c66635
diff --git a/Install/setup.m b/Install/setup.m
index d82b5558..fd8b44ed 100644
--- a/Install/setup.m
+++ b/Install/setup.m
@@ -6,6 +6,8 @@ function setup()
 
 try
 
+    setNamespace('Homer3');
+    
     currdir = filesepStandard(pwd);
         
     h = waitbar(0,'Installation Progress ...');
@@ -55,7 +57,7 @@ function main()
 iStep = 1;
 
 fprintf('dirnameSrc = %s\n', dirnameSrc)
-fprintf('dirnameDst = %s\n\n', dirnameDst)
+fprintf('dirnameDst = %s\n', dirnameDst)
 
 logger = Logger([dirnameSrc, 'Setup']);
 
@@ -63,7 +65,7 @@ function main()
 
 v = getVernum();
 logger.Write('==========================================\n');
-logger.Write('Setup script for %s v%s.%s,%s:\n', exename, v{1}, v{2}, v{3});
+logger.Write('Setup script for %s v%s.%s.%s:\n', exename, v{1}, v{2}, v{3});
 logger.Write('==========================================\n\n');
 
 logger.Write('Platform params:\n');
@@ -118,9 +120,12 @@ function main()
 function err = cleanup()
 global dirnameSrc
 global dirnameDst
+global logger 
 
 err = 0;
 
+logger = [];
+
 % Uninstall old installation
 try
     if exist(dirnameDst,'dir')
@@ -137,27 +142,30 @@ function main()
 end
 
 % Change source dir if not on PC
-if ~ispc() && ~isdeployed()
-    dirnameSrc0 = dirnameSrc;
-    
+if ~ispc()
     dirnameSrc = sprintf('~/Downloads/%s_install/', lower(getAppname));
     fprintf('SETUP:    current folder is %s\n', pwd);   
-    rmdir_safe(sprintf('~/Desktop/%s_install/', lower(getAppname())));
-    rmdir_safe(dirnameSrc);
-    rmdir_safe('~/Desktop/Test/');
     
-    if ispathvalid(dirnameSrc)
-        err = -1;
-    end
-    if ispathvalid('~/Desktop/%s_install/')
-        err = -1;
-    end
-    if ispathvalid('~/Desktop/Test/')
-        err = -1;
+    if ~isdeployed()
+        rmdir_safe(sprintf('~/Desktop/%s_install/', lower(getAppname())));
+        if ~pathscompare(dirnameSrc, dirnameSrc0)
+            rmdir_safe(dirnameSrc);            
+            if ispathvalid(dirnameSrc)
+                err = -1;
+            end
+            copyFile(dirnameSrc0, dirnameSrc);
+        end
+        rmdir_safe('~/Desktop/Test/');
+        
+        if ispathvalid('~/Desktop/%s_install/')
+            err = -1;
+        end
+        if ispathvalid('~/Desktop/Test/')
+            err = -1;
+        end
+        
+        cd(dirnameSrc);
     end
-       
-    copyFile(dirnameSrc0, dirnameSrc);
-    cd(dirnameSrc);
 end
 
 
@@ -197,7 +205,13 @@ function copyFile(src, dst, type)
     end
     
     % Copy file from source to destination folder
-    logger.Write('Copying %s to %s\n', src, dst);
+    
+    logmsg = sprintf('Copying %s to %s\n', src, dst);
+    if isempty(logger)
+        fprintf(logmsg);
+    else
+        logger.Write(logmsg);
+    end
     copyfile(src, dst);
 
     if ~isempty(iStep)
diff --git a/UnitTests/CleanUp.m b/UnitTests/CleanUp.m
index 5b54fc88..1e1f3c4a 100644
--- a/UnitTests/CleanUp.m
+++ b/UnitTests/CleanUp.m
@@ -4,6 +4,7 @@ function CleanUp(standalone, start)
 global procStreamStyle
 global testidx;
 global logger
+global cfg
 global maingui
 
 if ~exist('standalone','var') || isempty(standalone)
@@ -52,11 +53,10 @@ function CleanUp(standalone, start)
 fclose all;
 
 % Create or restore config file
-c = ConfigFileClass();
-if c.BackupExists()
-    c.Restore()
+if cfg.BackupExists()
+    cfg.Restore()
 else
-    c.Save('backup');
+    cfg.Save('backup');
 end
 
 if ~start
diff --git a/UnitTests/UnitTestsAll.m b/UnitTests/UnitTestsAll.m
index 938e0139..06ee6a59 100644
--- a/UnitTests/UnitTestsAll.m
+++ b/UnitTests/UnitTestsAll.m
@@ -1,6 +1,6 @@
 function UnitTestsAll()
 global logger
-
+global cfg 
 t_local = tic;
 
 setNamespace('Homer3')
@@ -10,17 +10,17 @@ function UnitTestsAll()
 cleanupObj = onCleanup(@()userInterrupt_Callback(true));
 
 logger = Logger('UnitTestsAll');
+cfg = ConfigFileClass();
 
-c = ConfigFileClass();
-c.SetValue('Regression Test Active','true');
+cfg.SetValue('Regression Test Active','true');
 
-c.SetValue('Include Archived User Functions','Yes');
-c.SetValue('Default Processing Stream Style','NIRS');
-c.Save();
+cfg.SetValue('Include Archived User Functions','Yes');
+cfg.SetValue('Default Processing Stream Style','NIRS');
+cfg.Save();
 % UnitTestsAll_Nirs(false);
 
-c.SetValue('Default Processing Stream Style','SNIRF');
-c.Save();
+cfg.SetValue('Default Processing Stream Style','SNIRF');
+cfg.Save();
 UnitTestsAll_Snirf(false);
 UnitTestsAll_MainGUI(false)
 
diff --git a/UnitTests/UnitTestsAll_MainGUI.m b/UnitTests/UnitTestsAll_MainGUI.m
index 23df4162..e78cf01e 100644
--- a/UnitTests/UnitTestsAll_MainGUI.m
+++ b/UnitTests/UnitTestsAll_MainGUI.m
@@ -50,8 +50,8 @@ function userInterrupt_Callback(standalone)
 
 % ---------------------------------------------------
 function configureAppSettings()
-c = ConfigFileClass();
-c.SetValue('Regression Test Active','true');
-c.SetValue('Default Processing Stream Style','SNIRF');
-c.Save();
+global cfg
+cfg.SetValue('Regression Test Active','true');
+cfg.SetValue('Default Processing Stream Style','SNIRF');
+cfg.Save();
 
diff --git a/UnitTests/UnitTestsAll_Snirf.m b/UnitTests/UnitTestsAll_Snirf.m
index 65a577cc..607f5aa5 100644
--- a/UnitTests/UnitTestsAll_Snirf.m
+++ b/UnitTests/UnitTestsAll_Snirf.m
@@ -66,7 +66,7 @@ function userInterrupt_Callback(standalone)
 
 % ---------------------------------------------------
 function configureAppSettings()
-c = ConfigFileClass();
-c.SetValue('Regression Test Active','true');
-c.SetValue('Default Processing Stream Style','SNIRF');
-c.Save();
+global cfg
+cfg.SetValue('Regression Test Active','true');
+cfg.SetValue('Default Processing Stream Style','SNIRF');
+cfg.Save();
diff --git a/Utils/Shared b/Utils/Shared
index 38600f5e..adbc0998 160000
--- a/Utils/Shared
+++ b/Utils/Shared
@@ -1 +1 @@
-Subproject commit 38600f5ed17640189f19f3c51ba7a7c2750f5482
+Subproject commit adbc09983c79070e2e017530e0554c30bb72368a