diff --git a/lib/CPP_BIDS b/lib/CPP_BIDS
index c6659f7..c23210f 160000
--- a/lib/CPP_BIDS
+++ b/lib/CPP_BIDS
@@ -1 +1 @@
-Subproject commit c6659f74e995ab870336bc266fe849c554a9f044
+Subproject commit c23210f5b35faa1505ca2cc35c92c3168564f98a
diff --git a/lib/CPP_PTB b/lib/CPP_PTB
index dc6d344..56b44dd 160000
--- a/lib/CPP_PTB
+++ b/lib/CPP_PTB
@@ -1 +1 @@
-Subproject commit dc6d3449c5857211f6a60b4944b09dc8fe7f7051
+Subproject commit 56b44dde23db03cd9d77165231bbf74e9388930e
diff --git a/setParameters.m b/setParameters.m
index 5fb65fc..114e1e6 100644
--- a/setParameters.m
+++ b/setParameters.m
@@ -50,15 +50,15 @@
     % block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock
 
     % Time between blocs in secs
-    cfg.IBI = 1.8 * 3; % 8;
+    cfg.timing.IBI = 1.8 * 3; % 8;
     % Time between events in secs
-    cfg.ISI = 0.1;
+    cfg.timing.ISI = 0.1;
     % Number of seconds before the motion stimuli are presented
-    cfg.onsetDelay = .1;
+    cfg.timing.onsetDelay = .1;
     % Number of seconds after the end all the stimuli before ending the run
-    cfg.endDelay = .1;
+    cfg.timing.endDelay = .1;
 
-    cfg.eventDuration = 0.8; % second
+    cfg.timing.eventDuration = 0.8; % second
 
     %% Visual Stimulation
 
diff --git a/subfun/doDotMo.m b/subfun/doDotMo.m
index 23217c8..5978421 100644
--- a/subfun/doDotMo.m
+++ b/subfun/doDotMo.m
@@ -19,7 +19,7 @@
     dots = initDots(cfg, thisEvent);
 
     % Set for how many frames this event will last
-    framesLeft = floor(cfg.eventDuration / cfg.screen.ifi);
+    framesLeft = floor(cfg.timing.eventDuration / cfg.screen.ifi);
 
     %% Start the dots presentation
     vbl = Screen('Flip', cfg.screen.win);
diff --git a/visualLocTanslational.m b/visualLocTranslational.m
similarity index 96%
rename from visualLocTanslational.m
rename to visualLocTranslational.m
index 02b3524..1912a73 100644
--- a/visualLocTanslational.m
+++ b/visualLocTranslational.m
@@ -63,6 +63,7 @@
 
     disp(cfg);
 
+    % Show experiment instruction
     standByScreen(cfg);
 
     % prepare the KbQueue to collect responses
@@ -76,7 +77,7 @@
 
     getResponse('start', cfg.keyboard.responseBox);
 
-    WaitSecs(cfg.onsetDelay);
+    WaitSecs(cfg.timing.onsetDelay);
 
     %% For Each Block
 
@@ -125,13 +126,13 @@
             saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString);
 
             % wait for the inter-stimulus interval
-            WaitSecs(cfg.ISI);
+            WaitSecs(cfg.timing.ISI);
 
         end
 
         eyeTracker('StopRecordings', cfg);
 
-        WaitSecs(cfg.IBI);
+        WaitSecs(cfg.timing.IBI);
 
         % trigger monitoring
         triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
@@ -143,7 +144,7 @@
     end
 
     % End of the run for the BOLD to go down
-    WaitSecs(cfg.endDelay);
+    WaitSecs(cfg.timing.endDelay);
 
     cfg = getExperimentEnd(cfg);