diff --git a/matlab/write_sbash.m b/matlab/write_sbash.m
index 573e6302d0a8ecf4713077742277378a96ce8289..7590654231b6c6421f1d12b600ee86371fd7cff2 100644
--- a/matlab/write_sbash.m
+++ b/matlab/write_sbash.m
@@ -5,15 +5,13 @@ fid = fopen(INPUT,'wt');
 fprintf(fid,[...
 '#!/bin/bash\n',...
 'mkdir -p $CINECA_SCRATCH/HeLaZ/wk\n',...
-'mkdir -p $CINECA_SCRATCH/HeLaZ/bin\n\n',...
 ...
 'cd $CINECA_SCRATCH/HeLaZ/wk/\n',...
-'cp $HOME/HeLaZ/wk/fort.90 .\n',...
-'cp $HOME/HeLaZ/wk/batch_script.sh .\n',...
-...%'cp $HOME/HeLaZ/bin/helaz ../bin\n\n',...
-'cp -r $HOME/HeLaZ/iCa ..\n\n',...
 ...
 'mkdir -p ', BASIC.RESDIR,'\n',...
+'cd ',BASIC.RESDIR,'\n',...
+'cp $HOME/HeLaZ/wk/fort.90 .\n',...
+'cp $HOME/HeLaZ/wk/batch_script.sh .\n',...
 ...
 'sbatch batch_script.sh\n',...
 'echo $CINECA_SCRATCH/HeLaZ/results/',BASIC.SIMID,'/',BASIC.PARAMS,'/out.txt']);
@@ -32,8 +30,8 @@ fprintf(fid,[...
 '#SBATCH --cpus-per-task=', CLUSTER.CPUPT,'\n',...
 '#SBATCH --ntasks-per-node=', CLUSTER.NTPN,'\n',...
 '#SBATCH --mem=', CLUSTER.MEM,'\n',...
-'#SBATCH --error=', BASIC.RESDIR,'err.txt\n',...
-'#SBATCH --output=', BASIC.RESDIR,'out.txt\n',...
+'#SBATCH --error=err.txt\n',...
+'#SBATCH --output=out.txt\n',...
 '#SBATCH --account=FUA34_GBSedge\n',...
 '#SBATCH --partition=skl_fua_',CLUSTER.PART,'\n\n',...
 ...% '#SBATCH --job-name=',PARAMS,'\n\n',...
@@ -41,7 +39,7 @@ fprintf(fid,[...
 'module load intelmpi\n',...
 'module load autoload hdf5/1.10.4--intelmpi--2018--binary\n',...
 'module load fftw\n',...
-'srun --cpu-bind=cores ./../bin/helaz']);
+'srun --cpu-bind=cores ./../../../bin/helaz']);
 
 fclose(fid);
 system(['cp batch_script.sh ',BASIC.RESDIR,'/.']);
diff --git a/wk/setup.m b/wk/setup.m
index 588e535438b280bd1f1ba95609b448f3f519b983..6a2205ae4a198aa21c8c0e3761feae89a531dcc8 100644
--- a/wk/setup.m
+++ b/wk/setup.m
@@ -47,15 +47,15 @@ INITIAL.initback_moments  = 0.0e-5;
 INITIAL.initnoise_moments = NOISE0;
 INITIAL.iseed             = 42;
 INITIAL.selfmat_file = ...
-    ['''../iCa/self_Coll_GKE_0_GKI_0_ESELF_1_ISELF_1_Pmaxe_',num2str(GRID.pmaxe),...
+    ['''../../../iCa/self_Coll_GKE_0_GKI_0_ESELF_1_ISELF_1_Pmaxe_',num2str(GRID.pmaxe),...
     '_Jmaxe_',num2str(GRID.jmaxe),'_Pmaxi_',num2str(GRID.pmaxi),'_Jmaxi_',...
     num2str(GRID.jmaxi),'_pamaxx_10.h5'''];
 INITIAL.eimat_file = ...
-    ['''../iCa/ei_Coll_GKE_0_GKI_0_ETEST_1_EBACK_1_Pmaxe_',num2str(GRID.pmaxe),...
+    ['''../../../iCa/ei_Coll_GKE_0_GKI_0_ETEST_1_EBACK_1_Pmaxe_',num2str(GRID.pmaxe),...
     '_Jmaxe_',num2str(GRID.jmaxe),'_Pmaxi_',num2str(GRID.pmaxi),'_Jmaxi_',...
     num2str(GRID.jmaxi),'_pamaxx_10_tau_1.0000_mu_0.0233.h5'''];
 INITIAL.iemat_file = ...
-    ['''../iCa/ie_Coll_GKE_0_GKI_0_ITEST_1_IBACK_1_Pmaxe_',num2str(GRID.pmaxe),...
+    ['''../../../iCa/ie_Coll_GKE_0_GKI_0_ITEST_1_IBACK_1_Pmaxe_',num2str(GRID.pmaxe),...
     '_Jmaxe_',num2str(GRID.jmaxe),'_Pmaxi_',num2str(GRID.pmaxi),'_Jmaxi_',...
     num2str(GRID.jmaxi),'_pamaxx_10_tau_1.0000_mu_0.0233.h5'''];
 % Naming and creating input file
@@ -89,9 +89,9 @@ OUTPUTS.write_moments = '.true.';
 OUTPUTS.write_phi     = '.true.';
 OUTPUTS.write_non_lin = OUTPUTS.write_moments;
 if NON_LIN == 0; OUTPUTS.write_non_lin = '.false.'; end;
-OUTPUTS.write_doubleprecision = '.true.';
-OUTPUTS.resfile0      = ['''',BASIC.RESDIR,'outputs',''''];
-OUTPUTS.rstfile0      = ['''',BASIC.RESDIR,'checkpoint',''''];
+OUTPUTS.write_doubleprecision = '.false.';
+OUTPUTS.resfile0      = '''outputs''';
+OUTPUTS.rstfile0      = '''checkpoint''';
 OUTPUTS.job2load      = JOB2LOAD;
 %% Create directories
 if ~exist(SIMDIR, 'dir')