diff --git a/CTD_Chipod/Templates/SummarizeProc_Template.m b/CTD_Chipod/Templates/SummarizeProc_Template.m
index 98133cc..7e5cc22 100644
--- a/CTD_Chipod/Templates/SummarizeProc_Template.m
+++ b/CTD_Chipod/Templates/SummarizeProc_Template.m
@@ -27,7 +27,7 @@
 
 cd(fullfile(BaseDir,'mfiles'))
 figdir=fullfile(BaseDir,'Figures')
-load(fullfile(BaseDir,'Data','proc_info.mat'))
+load(fullfile(BaseDir_data,'Data','proc','proc_info.mat'))
 
 
 %% Plot if we have data, if T1cal is good, and time offset for one chipod
diff --git a/CTD_Chipod/mfiles/AddBathyToChipod.m b/CTD_Chipod/mfiles/AddBathyToChipod.m
index 56b7b3f..6b33de0 100644
--- a/CTD_Chipod/mfiles/AddBathyToChipod.m
+++ b/CTD_Chipod/mfiles/AddBathyToChipod.m
@@ -15,7 +15,7 @@
 project='P15S'
 
 eval(['Load_chipod_paths_' project])
-load(fullfile(BaseDir,'Data','proc_info.mat'))
+load(fullfile(BaseDir_data,'Data','proc_info.mat'))
 
 % Get lat/lons
 lat=proc_info.lat;
diff --git a/CTD_Chipod/mfiles/Add_CTD_to_XC.m b/CTD_Chipod/mfiles/Add_CTD_to_XC.m
index 319ebd1..fec063c 100644
--- a/CTD_Chipod/mfiles/Add_CTD_to_XC.m
+++ b/CTD_Chipod/mfiles/Add_CTD_to_XC.m
@@ -17,7 +17,7 @@
 eval(['Load_chipod_paths_' project])
 
 clear proc_info
-load(fullfile(BaseDir,'Data','proc_info.mat'))
+load(fullfile(BaseDir_data,'Data','proc_info.mat'))
 
 % throw out any unreasonable depths
 proc_info.Prange(proc_info.Prange>8000)=nan;
diff --git a/CTD_Chipod/mfiles/MakeCasts_CTDchipod_function.m b/CTD_Chipod/mfiles/MakeCasts_CTDchipod_function.m
index ea7dfca..7c9eae3 100644
--- a/CTD_Chipod/mfiles/MakeCasts_CTDchipod_function.m
+++ b/CTD_Chipod/mfiles/MakeCasts_CTDchipod_function.m
@@ -86,7 +86,7 @@ function MakeCasts_CTDchipod_function(the_project,mixpath)
 MakeResultsTextFile
 
 % Make a structure to save processing summary info
-if ~exist(fullfile(BaseDir,'Data','proc_info.mat'),'file')
+if ~exist(fullfile(BaseDir_data,'Data','proc','proc_info.mat'),'file')
     
     proc_info         = struct;
     proc_info.the_project = the_project;
@@ -111,7 +111,7 @@ function MakeCasts_CTDchipod_function(the_project,mixpath)
     
 else
     disp('proc_info already exists, will load and add to it')
-    load(fullfile(BaseDir,'Data','proc_info.mat'))
+    load(fullfile(BaseDir_data,'Data','proc_info.mat'))
 end
 
 % Loop through each ctd file
@@ -412,7 +412,7 @@ function MakeCasts_CTDchipod_function(the_project,mixpath)
     proc_info.MakeInfo = ['Made ' datestr(now) ] ;
     proc_info.last_iSN = iSN;
     proc_info.last_icast = icast;
-    save(fullfile(BaseDir,'Data','proc','proc_info.mat'),'proc_info')
+    save(fullfile(BaseDir_data,'Data','proc','proc_info.mat'),'proc_info')
     
 end % icast (each CTD file)
 
@@ -426,7 +426,7 @@ function MakeCasts_CTDchipod_function(the_project,mixpath)
     'Name : CTD filename for each cast';...
     'duration : length of cast in days'} ;
 
-save(fullfile(BaseDir,'Data','proc','proc_info.mat'),'proc_info')
+save(fullfile(BaseDir_data,'Data','proc','proc_info.mat'),'proc_info')
 
 telapse = toc(tstart);
 
diff --git a/CTD_Chipod/mfiles/PlotTimeOffsetsCTDchipod_General.m b/CTD_Chipod/mfiles/PlotTimeOffsetsCTDchipod_General.m
index daceb43..fa8aa8d 100644
--- a/CTD_Chipod/mfiles/PlotTimeOffsetsCTDchipod_General.m
+++ b/CTD_Chipod/mfiles/PlotTimeOffsetsCTDchipod_General.m
@@ -23,7 +23,7 @@ function PlotTimeOffsetsCTDchipod_General(Project)
 eval(['Load_chipod_paths_' Project])
 eval(['Chipod_Deploy_Info_' Project])
 
-load( fullfile(BaseDir,'Data','proc','proc_info.mat'))
+load( fullfile(BaseDir_data,'Data','proc','proc_info.mat'))
 
 % loop through chipods
 for iSN=1:length(ChiInfo.SNs)
diff --git a/CTD_Chipod/mfiles/Plot_TP_profiles_EachCast_CTDchipod.m b/CTD_Chipod/mfiles/Plot_TP_profiles_EachCast_CTDchipod.m
index d7f100c..2fc442b 100644
--- a/CTD_Chipod/mfiles/Plot_TP_profiles_EachCast_CTDchipod.m
+++ b/CTD_Chipod/mfiles/Plot_TP_profiles_EachCast_CTDchipod.m
@@ -247,7 +247,7 @@ function Plot_TP_profiles_EachCast_CTDchipod(the_project)
     end
     
     if saveplot==1
-        %figdir=fullfile(BaseDir,'Figures','TPprofiles_AllSN');
+        %figdir=fullfile(BaseDir_data,'Figures','TPprofiles_AllSN');
         figdir=fullfile(fig_path,'TPprofiles_AllSN');
         ChkMkDir(figdir)
         print( fullfile( figdir , ['TP_profs_' castname] ) , '-dpng' )
diff --git a/CTD_Chipod/mfiles/SummarizeChiProc.m b/CTD_Chipod/mfiles/SummarizeChiProc.m
index 91e22d2..1814029 100644
--- a/CTD_Chipod/mfiles/SummarizeChiProc.m
+++ b/CTD_Chipod/mfiles/SummarizeChiProc.m
@@ -33,7 +33,7 @@ function SummarizeChiProc(the_project)
 % load deployment info
 eval(['Chipod_Deploy_Info_' the_project])
 
-load( fullfile(BaseDir,'Data','proc','proc_info.mat') )
+load( fullfile(BaseDir_data,'Data','proc','proc_info.mat') )
 
 
 %% Plot if we have chi for each cast data
diff --git a/CTD_Chipod/mfiles/do_chi_calc_ctd_chipod.m b/CTD_Chipod/mfiles/do_chi_calc_ctd_chipod.m
index e605ee5..c4f97bf 100644
--- a/CTD_Chipod/mfiles/do_chi_calc_ctd_chipod.m
+++ b/CTD_Chipod/mfiles/do_chi_calc_ctd_chipod.m
@@ -82,7 +82,7 @@ function do_chi_calc_ctd_chipod(the_project,mixpath,varargin)
     % Specific paths for this sensor
     clear chi_proc_path_specific chi_fig_path savedir_cal
     chi_proc_path_specific = fullfile(chi_proc_path,[whSN]) ;
-    chi_fig_path_specific  = fullfile(fig_path,'proc',whSN) ;
+    chi_fig_path_specific  = fullfile(chi_proc_path_specific,'figures') ;
     savedir_cal = fullfile(chi_proc_path_specific,'cal')    ;
     
     %##
diff --git a/CTD_Chipod/mfiles/make_combined_chi_struct.m b/CTD_Chipod/mfiles/make_combined_chi_struct.m
index 55c570d..9c4f758 100644
--- a/CTD_Chipod/mfiles/make_combined_chi_struct.m
+++ b/CTD_Chipod/mfiles/make_combined_chi_struct.m
@@ -174,7 +174,7 @@
 
 if savedata == 1
     pathstr = MakeChiPathStr(Params) ;
-    save(fullfile(BaseDir,'data',[the_project '_XC_' pathstr]),'XC')
+    save(fullfile(BaseDir_data,'Data',[the_project '_XC_' pathstr]),'XC')
 end
 
 %%
diff --git a/CTD_Chipod/mfiles/plot_XC_summaries.m b/CTD_Chipod/mfiles/plot_XC_summaries.m
index d545806..0205e69 100644
--- a/CTD_Chipod/mfiles/plot_XC_summaries.m
+++ b/CTD_Chipod/mfiles/plot_XC_summaries.m
@@ -37,7 +37,7 @@ function plot_XC_summaries(the_project)
 
 pathstr = MakeChiPathStr(Params) ;
 
-load(fullfile(BaseDir,'Data',[ChiInfo.the_project '_XC_' pathstr]),'XC')
+load(fullfile(BaseDir_data,'Data',[the_project '_XC_' pathstr]),'XC')
 
 ChkMkDir( fullfile(fig_path,'XC'))